Merge branch 'maint'

diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 0eeeb0e45090661c0576607792ff9b91d096e282..9f8adb1f824a5bafe8829e5ab613e2ab83065f4f 100755 (executable)
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -31,6 +31,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 &&
@@ -75,4 +136,29 @@ test_expect_success 'invalid @{n} reference' '
        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