mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
73b690a634
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue