diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2009-11-18 17:15:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:05:18 -0800 |
| commit | 5565f47c4054e9a1abfad8c4a754e9a6224dc591 (patch) | |
| tree | d3f70dee65edfdc77e947bb63b9502848e7cb44c | |
| parent | 5d005922bc781c1f6ec9ae0af466f308a7576612 (diff) | |
| download | git-5565f47c4054e9a1abfad8c4a754e9a6224dc591.tar.gz git-5565f47c4054e9a1abfad8c4a754e9a6224dc591.tar.xz | |
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>
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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" \ |