From 53a5b443b4b3d5beb102615f402e0e4da5ba9179 Mon Sep 17 00:00:00 2001
From: Jeff King <peff@peff.net>
Date: Wed, 12 Mar 2008 17:37:37 -0400
Subject: [PATCH] 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>
---
 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 bf8f778a4..637b4e19d 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 0000000000000000000000000000000000000000..db2f89090c1c4de05e4f82ea39ea118fccfd48dd
GIT binary patch
literal 116
zcmXxbF$#k~5Jq9^ImPtD=#EH8x;=oT%K;qs->?u?P{ABu2(fz2_fpB3Ro`XjsmtX9
z_Ft&fgfAo5!x7pxTMzd;TL`ydAXWW)5|QhPk=0m?V<g=$FEx=oUt{Cg51=;3vZjqr
Do_`?W

literal 0
HcmV?d00001

-- 
2.30.2