From 53a5b443b4b3d5beb102615f402e0e4da5ba9179 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 12 Mar 2008 17:37:37 -0400 Subject: t4020: don't use grep -a Solaris /usr/bin/grep doesn't understand "-a". In this case we can just include the expected output with the test, which is a better test anyway. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t4020-diff-external.sh | 3 ++- t/t4020/diff.NUL | Bin 0 -> 116 bytes 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 t/t4020/diff.NUL diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index bf8f778a47..637b4e19d5 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -103,7 +103,8 @@ echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file test_expect_success 'force diff with "diff"' ' echo >.gitattributes "file diff" && - git diff | grep -a second + git diff >actual && + test_cmp ../t4020/diff.NUL actual ' test_done diff --git a/t/t4020/diff.NUL b/t/t4020/diff.NUL new file mode 100644 index 0000000000..db2f89090c Binary files /dev/null and b/t/t4020/diff.NUL differ -- cgit v1.2.3