diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-11-22 16:58:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:20:59 -0800 |
| commit | b48275998399561780af85d429da3caceeecd2fe (patch) | |
| tree | 35e86d626dc048e75ed6e470a4571fe76ec78407 | |
| parent | 73a1d050c47dfa0fc758eedd9d3bb60b7449e14f (diff) | |
| download | git-b48275998399561780af85d429da3caceeecd2fe.tar.gz git-b48275998399561780af85d429da3caceeecd2fe.tar.xz | |
grep: unset GREP_OPTIONS before spawning external grep
While we're at it, also unset GREP_COLOR and GREP_COLORS in case colouring
is not enabled, to be on the safe side. The presence of these variables
alone is not sufficient to trigger coloured output with GNU grep, but
other implementations may behave differently.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-grep.c | 4 | ||||
| -rwxr-xr-x | t/t7002-grep.sh | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 01be9bf7f..9a9e3fccd 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -433,7 +433,11 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) if (opt->color_external && strlen(opt->color_external) > 0) push_arg(opt->color_external); + } else { + unsetenv("GREP_COLOR"); + unsetenv("GREP_COLORS"); } + unsetenv("GREP_OPTIONS"); hit = 0; argc = nr; diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index ae5290ab4..dd0da6c0b 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -213,6 +213,11 @@ test_expect_success 'grep -e A --and --not -e B' ' test_cmp expected actual ' +test_expect_success 'grep should ignore GREP_OPTIONS' ' + GREP_OPTIONS=-v git grep " mmap bar\$" >actual && + test_cmp expected actual +' + test_expect_success 'grep -f, non-existent file' ' test_must_fail git grep -f patterns ' |