cherry-pick, revert: add a label for ancestor

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" \