Merge branch 'md/interix-update'

diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index af721f97192d70457b289d623c70f18569f5134a..0843a1c13b3e1458418ee59c548e5441f113bbe7 100755 (executable)
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -6,6 +6,16 @@ exec </dev/null
 
 . ./test-lib.sh
 
+test_did_you_mean ()
+{
+       sq="'" &&
+       cat >expected <<-EOF &&
+       fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}.
+       Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?
+       EOF
+       test_cmp expected error
+}
+
 HASH_file=
 
 test_expect_success 'set up basic repo' '
@@ -31,6 +41,67 @@ test_expect_success 'correct file objects' '
         test $HASH_file = $(git rev-parse :0:file.txt) )
 '
 
+test_expect_success 'correct relative file objects (0)' '
+       git rev-parse :file.txt >expected &&
+       git rev-parse :./file.txt >result &&
+       test_cmp expected result &&
+       git rev-parse :0:./file.txt >result &&
+       test_cmp expected result
+'
+
+test_expect_success 'correct relative file objects (1)' '
+       git rev-parse HEAD:file.txt >expected &&
+       git rev-parse HEAD:./file.txt >result &&
+       test_cmp expected result
+'
+
+test_expect_success 'correct relative file objects (2)' '
+       (
+               cd subdir &&
+               git rev-parse HEAD:../file.txt >result &&
+               test_cmp ../expected result
+       )
+'
+
+test_expect_success 'correct relative file objects (3)' '
+       (
+               cd subdir &&
+               git rev-parse HEAD:../subdir/../file.txt >result &&
+               test_cmp ../expected result
+       )
+'
+
+test_expect_success 'correct relative file objects (4)' '
+       git rev-parse HEAD:subdir/file.txt >expected &&
+       (
+               cd subdir &&
+               git rev-parse HEAD:./file.txt >result &&
+               test_cmp ../expected result
+       )
+'
+
+test_expect_success 'correct relative file objects (5)' '
+       git rev-parse :subdir/file.txt >expected &&
+       (
+               cd subdir &&
+               git rev-parse :./file.txt >result &&
+               test_cmp ../expected result &&
+               git rev-parse :0:./file.txt >result &&
+               test_cmp ../expected result
+       )
+'
+
+test_expect_success 'correct relative file objects (6)' '
+       git rev-parse :file.txt >expected &&
+       (
+               cd subdir &&
+               git rev-parse :../file.txt >result &&
+               test_cmp ../expected result &&
+               git rev-parse :0:../file.txt >result &&
+               test_cmp ../expected result
+       )
+'
+
 test_expect_success 'incorrect revision id' '
        test_must_fail git rev-parse foobar:file.txt 2>error &&
        grep "Invalid object name '"'"'foobar'"'"'." error &&
@@ -45,7 +116,7 @@ test_expect_success 'incorrect file in sha1:path' '
        grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error &&
        (cd subdir &&
         test_must_fail git rev-parse HEAD:file2.txt 2> error &&
-        grep "Did you mean '"'"'HEAD:subdir/file2.txt'"'"'?" error )
+        test_did_you_mean HEAD subdir/ file2.txt exists )
 '
 
 test_expect_success 'incorrect file in :path and :N:path' '
@@ -54,16 +125,50 @@ test_expect_success 'incorrect file in :path and :N:path' '
        test_must_fail git rev-parse :1:nothing.txt 2> error &&
        grep "Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
        test_must_fail git rev-parse :1:file.txt 2> error &&
-       grep "Did you mean '"'"':0:file.txt'"'"'?" error &&
+       test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
        (cd subdir &&
         test_must_fail git rev-parse :1:file.txt 2> error &&
-        grep "Did you mean '"'"':0:file.txt'"'"'?" error &&
+        test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
         test_must_fail git rev-parse :file2.txt 2> error &&
-        grep "Did you mean '"'"':0:subdir/file2.txt'"'"'?" error &&
+        test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
         test_must_fail git rev-parse :2:file2.txt 2> error &&
-        grep "Did you mean '"'"':0:subdir/file2.txt'"'"'?" error) &&
+        test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
        test_must_fail git rev-parse :disk-only.txt 2> error &&
        grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
 '
 
+test_expect_success 'invalid @{n} reference' '
+       test_must_fail git rev-parse master@{99999} >output 2>error &&
+       test -z "$(cat output)" &&
+       grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error  &&
+       test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
+       test -z "$(cat output)" &&
+       grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
+'
+
+test_expect_success 'relative path not found' '
+       (
+               cd subdir &&
+               test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
+               grep subdir/nonexistent.txt error
+       )
+'
+
+test_expect_success 'relative path outside worktree' '
+       test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
+       test -z "$(cat output)" &&
+       grep "outside repository" error
+'
+
+test_expect_success 'relative path when cwd is outside worktree' '
+       test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
+       test -z "$(cat output)" &&
+       grep "relative path syntax can.t be used outside working tree." error
+'
+
+test_expect_success 'relative path when startup_info is NULL' '
+       test_must_fail test-match-trees HEAD:./file.txt HEAD:./file.txt 2>error &&
+       grep "BUG: startup_info struct is not initialized." error
+'
+
 test_done