diff options
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 09c2f4913b..d455176f78 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -299,12 +299,18 @@ static int grep_config(const char *var, const char *value, void *cb) if (!strcmp(var, "color.grep")) opt->color = git_config_colorbool(var, value, -1); + else if (!strcmp(var, "color.grep.context")) + color = opt->color_context; else if (!strcmp(var, "color.grep.filename")) color = opt->color_filename; + else if (!strcmp(var, "color.grep.function")) + color = opt->color_function; else if (!strcmp(var, "color.grep.linenumber")) color = opt->color_lineno; else if (!strcmp(var, "color.grep.match")) color = opt->color_match; + else if (!strcmp(var, "color.grep.selected")) + color = opt->color_selected; else if (!strcmp(var, "color.grep.separator")) color = opt->color_sep; else @@ -879,9 +885,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix) opt.regflags = REG_NEWLINE; opt.max_depth = -1; + strcpy(opt.color_context, ""); strcpy(opt.color_filename, ""); + strcpy(opt.color_function, ""); strcpy(opt.color_lineno, ""); strcpy(opt.color_match, GIT_COLOR_BOLD_RED); + strcpy(opt.color_selected, ""); strcpy(opt.color_sep, GIT_COLOR_CYAN); opt.color = -1; git_config(grep_config, &opt); |