Merge branch 'ab/gc-reflog'

diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index fb25cdb789b17db779f56f7ad0edefa8da615514..0168946b6394092bbedc4da6d57ef9ba8e205927 100755 (executable)
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -136,4 +136,12 @@ test_expect_success 'diff --no-index from repo subdir with absolute paths' '
        test_cmp expect actual
 '
 
+test_expect_success 'diff --no-index allows external diff' '
+       test_expect_code 1 \
+               env GIT_EXTERNAL_DIFF="echo external ;:" \
+               git diff --no-index non/git/a non/git/b >actual &&
+       echo external >expect &&
+       test_cmp expect actual
+'
+
 test_done