mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 05:32:08 +02:00
Code

Merge branch 'jc/apply-blank-at-eof-fix' into maint

Browse Source 
* jc/apply-blank-at-eof-fix:
  apply --whitespace=error: correctly report new blank lines at end
This commit is contained in:
Junio C Hamano 2011-10-21 10:49:26 -07:00
commit e63f87a6f7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/apply.c
View File

@ -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;
@ -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' &&
@ -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);