Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'
[gitweb.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index b8087bd29c5f233b28b685ec90a6a3cfaaa498d4..321a9fa68d491f7e5e89dc9e398b067f67a10c77 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-2953,6
+2953,8
@@
static int apply_one_fragment(struct apply_state *state,
newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
old--;
strbuf_setlen(&newlines, newlines.len - 1);
+ preimage.line_allocated[preimage.nr - 1].len--;
+ postimage.line_allocated[postimage.nr - 1].len--;
}
leading = frag->leading;