Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
apply: detect and mark whitespace errors in context lines when fixing
[gitweb.git]
/
builtin
/
apply.c
diff --git
a/builtin/apply.c
b/builtin/apply.c
index e8953404d2f1621fbb5d964b6b3adceed0ef74f6..a51a1b0872af6e6778e05079accfa8966f30f39a 100644
(file)
--- a/
builtin/apply.c
+++ b/
builtin/apply.c
@@
-1606,6
+1606,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 &&