Merge branch 'tr/merge-recursive-flush'

diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 4dc8c67edc683fd7fe492c7373226df74a0127bc..979e98398bebc21fe664ca4a19770e5b251bfc97 100755 (executable)
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -8,7 +8,12 @@ test_expect_success 'setup' '
        mkdir a &&
        mkdir b &&
        echo 1 >a/1 &&
-       echo 2 >a/2
+       echo 2 >a/2 &&
+       git init repo &&
+       echo 1 >repo/a &&
+       mkdir -p non/git &&
+       echo 1 >non/git/a &&
+       echo 1 >non/git/b
 '
 
 test_expect_success 'git diff --no-index directories' '
@@ -16,4 +21,12 @@ test_expect_success 'git diff --no-index directories' '
        test $? = 1 && test_line_count = 14 cnt
 '
 
+test_expect_success 'git diff --no-index relative path outside repo' '
+       (
+               cd repo &&
+               test_expect_code 0 git diff --no-index a ../non/git/a &&
+               test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
+       )
+'
+
 test_done