diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-04 08:41:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-04 09:35:24 (GMT) |
| commit | ef2035c5e55f852905b012dfb2dd242b4f77da70 (patch) | |
| tree | 0a54e237b0dc38402848ab337118298e1929bdc5 /builtin-apply.c | |
| parent | 82d97da30aba767e5c8406b595274af299858357 (diff) | |
| download | git-ef2035c5e55f852905b012dfb2dd242b4f77da70.zip git-ef2035c5e55f852905b012dfb2dd242b4f77da70.tar.gz git-ef2035c5e55f852905b012dfb2dd242b4f77da70.tar.bz2 | |
apply --whitespace=fix: fix handling of blank lines at the eof
b94f2ed (builtin-apply.c: make it more line oriented, 2008-01-26) broke
the logic used to detect if a hunk adds blank lines at the end of the
file. With the new code after that commit:
- img holds the contents of the file that the hunk is being applied to;
- preimage has the lines the hunk expects to be in img; and
- postimage has the lines the hunk wants to update the part in img that
corresponds to preimage with.
and we need to compare if the last line of preimage (not postimage)
matches the last line of img to see if the hunk applies at the end of the
file.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 7a1ff04..5b5bde4 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2069,7 +2069,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag, if (applied_pos >= 0) { if (ws_error_action == correct_ws_error && new_blank_lines_at_end && - postimage.nr + applied_pos == img->nr) { + preimage.nr + applied_pos == img->nr) { /* * If the patch application adds blank lines * at the end, and if the patch applies at the |