grep: unset GREP_OPTIONS before spawning external grep

René Scharfe · gitster · commit b48275998399 · 2009-11-22T16:20:59.000-08:00
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 &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
 '

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,11 @@ test_expect_success 'grep -e A --and --not -e B' '`
`213`	`213`	`test_cmp expected actual`
`214`	`214`	`'`
`215`	`215`
	`216`	`+test_expect_success 'grep should ignore GREP_OPTIONS' '`
	`217`	`+ GREP_OPTIONS=-v git grep " mmap bar\$" >actual &&`
	`218`	`+ test_cmp expected actual`
	`219`	`+'`
	`220`	`+`
`216`	`221`	`test_expect_success 'grep -f, non-existent file' '`
`217`	`222`	`test_must_fail git grep -f patterns`
`218`	`223`	`'`