X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4020-diff-external.sh;h=ed3bd5b3fe7c8b5ca52067e3015e0d770ee79bf2;hb=d8b3a2bf189a9e7fea76454157b77fa71c9abc05;hp=f0045cd788a275f525bbd94912c5ad09cf6226bd;hpb=43d151a1b087db22e2f9a754772b469de1194f67;p=git.git diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index f0045cd78..ed3bd5b3f 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -94,4 +94,16 @@ 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 | tr Z '\0' > file + +test_expect_success 'force diff with "diff"' ' + echo >.gitattributes "file diff" && + git diff | grep -a second +' + test_done