grep: prefer builtin over external one when coloring results

pclouds · gitster · commit 6e89ec0f1e71 · 2009-03-17T17:03:33.000-07:00
As far as I know, not all grep programs support coloring, so we should
rely on builtin grep. If you want external grep, set
color.grep.external to empty string.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-grep.c b/builtin-grep.c
@@ -825,6 +825,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		}
 	}
 
+	if (opt.color && !opt.color_external)
+		builtin_grep = 1;
 	if (!opt.pattern_list)
 		die("no pattern given.");
 	if ((opt.regflags != REG_NEWLINE) && opt.fixed)

Original file line number	Diff line number	Diff line change
`@@ -825,6 +825,8 @@ int cmd_grep(int argc, const char *argv, const char prefix)`
`825`	`825`	`}`
`826`	`826`	`}`
`827`	`827`
	`828`	`+ if (opt.color && !opt.color_external)`
	`829`	`+ builtin_grep = 1;`
`828`	`830`	`if (!opt.pattern_list)`
`829`	`831`	`die("no pattern given.");`
`830`	`832`	`if ((opt.regflags != REG_NEWLINE) && opt.fixed)`