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

"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
git-mirror · Mar 3, 2015 · 73b690a · 73b690a
2 parents 71f19cc + 0a80bc9
commit 73b690a
Showing 1 changed file with 3 additions and 0 deletions.
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 &&