From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:43 +0000 (-0700)
Subject: Merge branch 'jc/ws-error-highlight'
X-Git-Tag: v2.11.0-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5272d304af3528163cd5faa822f88086448ae57?hp=--cc

Merge branch 'jc/ws-error-highlight'

"git diff/log --ws-error-highlight=<kind>" lacked the corresponding
configuration variable to set it by default.

* jc/ws-error-highlight:
diff: introduce diff.wsErrorHighlight option
diff.c: move ws-error-highlight parsing helpers up
diff.c: refactor parse_ws_error_highlight()
t4015: split out the "setup" part of ws-error-highlight test
---

e5272d304af3528163cd5faa822f88086448ae57
diff --cc diff.c
index f5d6d7e4f6,9acf04f5b0..569f615d3b
--- a/diff.c
+++ b/diff.c
@@@ -254,8 -263,14 +292,17 @@@ int git_diff_ui_config(const char *var
  		return 0;
  	}
  
 +	if (git_diff_heuristic_config(var, value, cb) < 0)
 +		return -1;
++
+ 	if (!strcmp(var, "diff.wserrorhighlight")) {
+ 		int val = parse_ws_error_highlight(value);
+ 		if (val < 0)
+ 			return -1;
+ 		ws_error_highlight_default = val;
+ 		return 0;
+ 	}
+ 
  	if (git_color_config(var, value, cb) < 0)
  		return -1;