mirror of
https://github.com/git/git.git
synced 2024-06-03 14:36:10 +02:00
Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint
"git apply --inaccurate-eof" when used with "--ignore-space-change" triggered an internal sanity check, which has been fixed. * rs/apply-inaccurate-eof-with-incomplete-line: apply: update line lengths for --inaccurate-eof
This commit is contained in:
commit
43240cb731
2
apply.c
2
apply.c
|
@ -2958,6 +2958,8 @@ static int apply_one_fragment(struct apply_state *state,
|
||||||
newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
|
newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
|
||||||
old--;
|
old--;
|
||||||
strbuf_setlen(&newlines, newlines.len - 1);
|
strbuf_setlen(&newlines, newlines.len - 1);
|
||||||
|
preimage.line_allocated[preimage.nr - 1].len--;
|
||||||
|
postimage.line_allocated[postimage.nr - 1].len--;
|
||||||
}
|
}
|
||||||
|
|
||||||
leading = frag->leading;
|
leading = frag->leading;
|
||||||
|
|
|
@ -178,4 +178,18 @@ test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
|
||||||
test_must_fail git apply --no-ignore-whitespace patch5.patch
|
test_must_fail git apply --no-ignore-whitespace patch5.patch
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'apply --ignore-space-change --inaccurate-eof' '
|
||||||
|
echo 1 >file &&
|
||||||
|
git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
|
||||||
|
diff --git a/file b/file
|
||||||
|
--- a/file
|
||||||
|
+++ b/file
|
||||||
|
@@ -1 +1 @@
|
||||||
|
-1
|
||||||
|
+2
|
||||||
|
EOF
|
||||||
|
printf 2 >expect &&
|
||||||
|
test_cmp expect file
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in New Issue