X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4020-diff-external.sh;h=637b4e19d52e81cf1472a4ed9dcfb0c9ff00da2b;hb=c74815261225e5068490583b08303d158837ab9e;hp=f0045cd788a275f525bbd94912c5ad09cf6226bd;hpb=c63a3ad2c1d6f86cd7989055a133e06055239317;p=git.git

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index f0045cd78..637b4e19d 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -94,4 +94,17 @@ test_expect_success 'diff attribute should apply only to diff' '
 
 '
 
+test_expect_success 'no diff with -diff' '
+	echo >.gitattributes "file -diff" &&
+	git diff | grep Binary
+'
+
+echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
+
+test_expect_success 'force diff with "diff"' '
+	echo >.gitattributes "file diff" &&
+	git diff >actual &&
+	test_cmp ../t4020/diff.NUL actual
+'
+
 test_done