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 <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bert Wesarg committed
Nov 18, 2009 at 17:15 UTC
5565f47c4054e9a1abfad8c4a754e9a6224dc591
1 file changed
+2
t/test-lib.sh
+2
@@ -65,6 +65,8 @@ GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
65
# CDPATH into the environment
66
unset CDPATH
67
68
+unset GREP_OPTIONS
69
+
70
case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
71
1|2|true)
72
echo "* warning: Some tests will not work if GIT_TRACE" \