[PATCH] unset GREP_OPTIONS in test-lib.sh
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:47:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:47:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
---
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 f2ca536..6ac8dc6 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" \
--
tg: (785c58e..) bw/unset-GREP_OPTIONS (depends on: master)