Andrew's git / gitweb.git / diff
?
unset GREP_OPTIONS in test-lib.sh
authorBert Wesarg <bert.wesarg@googlemail.com>
Wed, 18 Nov 2009 16:15:19 +0000 (17:15 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 19:05:18 +0000 (11:05 -0800)
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 <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib.sh patch | blob | history
diff --git a/t/test-lib.sh b/t/test-lib.sh
index afd3053f96b789a73274217b384d245583500c04..a0e396a9522cec96443490fd77ff4abffb335287 100644 (file)
--- 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" \