diff options
| author | Jeff King <peff@peff.net> | 2008-03-12 17:37:37 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-13 00:57:53 -0700 |
| commit | 53a5b443b4b3d5beb102615f402e0e4da5ba9179 (patch) | |
| tree | be920da1d06201de928d97fb4718d4b528f13d0b /t | |
| parent | 82ebb0b6ec7470cab96a013d3d719c109003ef83 (diff) | |
| download | git-53a5b443b4b3d5beb102615f402e0e4da5ba9179.tar.gz git-53a5b443b4b3d5beb102615f402e0e4da5ba9179.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4020-diff-external.sh | 3 | ||||
| -rw-r--r-- | t/t4020/diff.NUL | bin | 0 -> 116 bytes |
2 files changed, 2 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000..db2f89090 --- /dev/null +++ b/t/t4020/diff.NUL |