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>
Jeff King committed
Mar 12, 2008 at 17:37 UTC
53a5b443b4b3d5beb102615f402e0e4da5ba9179
2 files changed
+2
-1
t/t4020-diff-external.sh
+2
-1
@@ -103,7 +103,8 @@ echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
103
104
test_expect_success 'force diff with "diff"' '
105
echo >.gitattributes "file diff" &&
106
- git diff | grep -a second
106
+ git diff >actual &&
107
+ test_cmp ../t4020/diff.NUL actual
108
'
109
110
test_done
t/t4020/diff.NUL
Binary files /dev/null and b/t/t4020/diff.NUL differ