Skip to content

Commit

Permalink
Merge branch 'jc/apply-blank-at-eof-fix' into maint
Browse files Browse the repository at this point in the history
* jc/apply-blank-at-eof-fix:
  apply --whitespace=error: correctly report new blank lines at end
  • Loading branch information
Junio C Hamano committed Oct 21, 2011
2 parents 6e89b37 + 8557263 commit e63f87a
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions builtin/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -2450,6 +2450,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
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;
Expand Down Expand Up @@ -2543,14 +2545,18 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
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' &&
Expand Down Expand Up @@ -2632,7 +2638,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
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);
Expand Down

0 comments on commit e63f87a

Please sign in to comment.