grep: don't support "grep.color"-like config options
color.grep and color.grep.* is the official and documented way to
highlight grep matches. Comparable options like diff.color.* and
status.color.* exist for backward compatibility reasons only and are not
documented any more.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin-grep.c b/builtin-grep.c
index 89489dd..f88a912 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -26,16 +26,13 @@
{
struct grep_opt *opt = cb;
- if (!strcmp(var, "grep.color") || !strcmp(var, "color.grep")) {
+ if (!strcmp(var, "color.grep")) {
opt->color = git_config_colorbool(var, value, -1);
return 0;
}
- if (!strcmp(var, "grep.color.external") ||
- !strcmp(var, "color.grep.external")) {
+ if (!strcmp(var, "color.grep.external"))
return git_config_string(&(opt->color_external), var, value);
- }
- if (!strcmp(var, "grep.color.match") ||
- !strcmp(var, "color.grep.match")) {
+ if (!strcmp(var, "color.grep.match")) {
if (!value)
return config_error_nonbool(var);
color_parse(value, var, opt->color_match);
