diff options
| author |  Markus Heidelberg <markus.heidelberg@web.de> | 2009-04-21 00:58:15 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-20 22:55:56 -0700 |
| commit | fe3420b616eba8027b080dc81020b0e0990f4809 (patch) | |
| tree | b01eadeac552f0dc44625ed0613f235e0f95b75d | |
| parent | Documentation: fix typos / spelling mistakes (diff) | |
| download | tgif-fe3420b616eba8027b080dc81020b0e0990f4809.tar.xz | |
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>
| -rw-r--r-- | builtin-grep.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 89489ddcf8..f88a912ace 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -26,16 +26,13 @@ static int grep_config(const char *var, const char *value, void *cb) { 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); |