diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:09:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:09:47 -0800 |
commit | 1703169b5299ddbd68eb92cf8b5920838f444ba1 (patch) | |
tree | f94637f5314bf948a24c9654b5ccc2ed1790ec9d /t | |
parent | Merge branch 'maint' (diff) | |
parent | Git 1.7.0.2 (diff) | |
download | tgif-1703169b5299ddbd68eb92cf8b5920838f444ba1.tar.xz |
Sync with 1.7.0.2
Diffstat (limited to 't')
-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 afd3053f96..a0e396a952 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" \ |