From: Jeff King <peff@peff.net>
Date: Wed, 12 Mar 2008 21:37:37 +0000 (-0400)
Subject: t4020: don't use grep -a
X-Git-Tag: v1.5.5-rc0~5^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53a5b443b4b3d5beb102615f402e0e4da5ba9179?ds=inline;hp=--cc

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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

53a5b443b4b3d5beb102615f402e0e4da5ba9179
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