Permalink
Browse files

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>
  • Loading branch information...
1 parent 82ebb0b commit 53a5b443b4b3d5beb102615f402e0e4da5ba9179 @peff peff committed with gitster Mar 12, 2008
Showing with 2 additions and 1 deletion.
  1. +2 −1 t/t4020-diff-external.sh
  2. BIN t/t4020/diff.NUL
@@ -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
View
Binary file not shown.

0 comments on commit 53a5b44

Please sign in to comment.