Git fork

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>

authored by

Jeff King and committed by
Junio C Hamano
53a5b443 82ebb0b6

+2 -1
+2 -1
t/t4020-diff-external.sh
··· 103 103 104 104 test_expect_success 'force diff with "diff"' ' 105 105 echo >.gitattributes "file diff" && 106 - git diff | grep -a second 106 + git diff >actual && 107 + test_cmp ../t4020/diff.NUL actual 107 108 ' 108 109 109 110 test_done
t/t4020/diff.NUL

This is a binary file and will not be displayed.