Merge branch 'maint-1.6.0' into maint-1.6.1

[git.git] / t / t4020-diff-external.sh

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 22ef7d44b08ac7ec20e799a194e27205c794c290..2a72e751e290ad59d5277695a1128aebb678c2a1 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -125,6 +125,14 @@ echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
 test_expect_success 'force diff with "diff"' '
        echo >.gitattributes "file diff" &&
        git diff >actual &&
+       test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual
+'
+
+test_expect_success 'diff --cached' '
+       git add file &&
+       git update-index --assume-unchanged file &&
+       echo second >file &&
+       git diff --cached >actual &&
        test_cmp ../t4020/diff.NUL actual
 '