From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Oct 2014 18:49:37 +0000 (-0700)
Subject: Merge branch 'rs/grep-color-words'
X-Git-Tag: v2.2.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf1f639ea2cb54f5dee2f1fe3435d0072ede9abb;p=thirdparty%2Fgit.git

Merge branch 'rs/grep-color-words'

Allow painting or not painting (partial) matches in context lines
when showing "grep -C<num>" output in color.

* rs/grep-color-words:
  grep: add color.grep.matchcontext and color.grep.matchselected
---

bf1f639ea2cb54f5dee2f1fe3435d0072ede9abb
diff --cc grep.c
index 4dc31ea386,f950651ae6..6e085f8297
--- a/grep.c
+++ b/grep.c
@@@ -107,6 -105,14 +110,14 @@@ int grep_config(const char *var, const 
  		color = opt->color_selected;
  	else if (!strcmp(var, "color.grep.separator"))
  		color = opt->color_sep;
+ 	else if (!strcmp(var, "color.grep.match")) {
+ 		int rc = 0;
+ 		if (!value)
+ 			return config_error_nonbool(var);
 -		color_parse(value, var, opt->color_match_context);
 -		color_parse(value, var, opt->color_match_selected);
++		rc |= color_parse(value, opt->color_match_context);
++		rc |= color_parse(value, opt->color_match_selected);
+ 		return rc;
+ 	}
  
  	if (color) {
  		if (!value)