Skip to content
/ git Public
forked from git/git

Commit

Permalink
t4020: don't use grep -a
Browse files Browse the repository at this point in the history
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
peff authored and gitster committed Mar 13, 2008
1 parent 82ebb0b commit 53a5b44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion t/t4020-diff-external.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added t/t4020/diff.NUL
Binary file not shown.

0 comments on commit 53a5b44

Please sign in to comment.