From: Bert Wesarg Date: Wed, 18 Nov 2009 16:15:19 +0000 (+0100) Subject: unset GREP_OPTIONS in test-lib.sh X-Git-Tag: v1.7.0.2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5565f47c4054e9a1abfad8c4a754e9a6224dc591;p=git.git unset GREP_OPTIONS in test-lib.sh I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this the test t4252-am-options.sh fails because it calls grep with a .rej file: grep "@@ -1,3 +1,3 @@" file-2.rej Signed-off-by: Bert Wesarg Signed-off-by: Junio C Hamano --- diff --git a/t/test-lib.sh b/t/test-lib.sh index afd3053f9..a0e396a95 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -65,6 +65,8 @@ GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u} # CDPATH into the environment unset CDPATH +unset GREP_OPTIONS + case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in 1|2|true) echo "* warning: Some tests will not work if GIT_TRACE" \