diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
commit | 43240cb7316a7ea653ada00adfddd5ea80f90cf3 (patch) | |
tree | b6e0d121867132767c29b5d89d985abf08b24cbe | |
parent | 2db93a80d37d463ab66dc71ba4e10cbaae8f807f (diff) | |
parent | 4855de123391daab82407b44de03ba5647e97694 (diff) | |
download | git-43240cb7316a7ea653ada00adfddd5ea80f90cf3.tar.gz |
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
-rw-r--r-- | apply.c | 2 | ||||
-rwxr-xr-x | t/t4107-apply-ignore-whitespace.sh | 14 |
2 files changed, 16 insertions, 0 deletions
@@ -2958,6 +2958,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; diff --git a/t/t4107-apply-ignore-whitespace.sh b/t/t4107-apply-ignore-whitespace.sh index 9e29b5262d..ac72eeaf27 100755 --- a/t/t4107-apply-ignore-whitespace.sh +++ b/t/t4107-apply-ignore-whitespace.sh @@ -178,4 +178,18 @@ test_expect_success 'patch5 fails (--no-ignore-whitespace)' ' 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 |