Merge branch 'jc/apply-ws-fix-expands-report'

gitster · gitster · commit 73b690a634b7 · 2015-03-03T14:37:02.000-08:00
"git apply --whitespace=fix" fixed whitespace errors in the common
context lines but did so without reporting.

* jc/apply-ws-fix-expands-report:
  apply: detect and mark whitespace errors in context lines when fixing
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -1601,6 +1601,9 @@ static int parse_fragment(const char *line, unsigned long size,
 			if (!deleted && !added)
 				leading++;
 			trailing++;
+			if (!apply_in_reverse &&
+			    ws_error_action == correct_ws_error)
+				check_whitespace(line, len, patch->ws_rule);
 			break;
 		case '-':
 			if (apply_in_reverse &&
