author | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Oct 2011 02:03:20 +0000 (19:03 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Oct 2011 02:03:20 +0000 (19:03 -0700) |
* jc/apply-blank-at-eof-fix:
apply --whitespace=error: correctly report new blank lines at end
apply --whitespace=error: correctly report new blank lines at end
builtin/apply.c | patch | blob | history |
diff --git a/builtin/apply.c b/builtin/apply.c
index 872e40ab1e0401a480ee8e852d09899f4d4553ed..694f55dc5ac4c439eeaceadd3e1c70df5bb42aa1 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
char *old, *oldlines;
struct strbuf newlines;
int new_blank_lines_at_end = 0;
+ int found_new_blank_lines_at_end = 0;
+ int hunk_linenr = frag->linenr;
unsigned long leading, trailing;
int pos, applied_pos;
struct image preimage;
error("invalid start of line: '%c'", first);
return -1;
}
- if (added_blank_line)
+ if (added_blank_line) {
+ if (!new_blank_lines_at_end)
+ found_new_blank_lines_at_end = hunk_linenr;
new_blank_lines_at_end++;
+ }
else if (is_blank_context)
;
else
new_blank_lines_at_end = 0;
patch += len;
size -= len;
+ hunk_linenr++;
}
if (inaccurate_eof &&
old > oldlines && old[-1] == '\n' &&
preimage.nr + applied_pos >= img->nr &&
(ws_rule & WS_BLANK_AT_EOF) &&
ws_error_action != nowarn_ws_error) {
- record_ws_error(WS_BLANK_AT_EOF, "+", 1, frag->linenr);
+ record_ws_error(WS_BLANK_AT_EOF, "+", 1,
+ found_new_blank_lines_at_end);
if (ws_error_action == correct_ws_error) {
while (new_blank_lines_at_end--)
remove_last_line(&postimage);