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 /t | |
| parent | 2db93a80d37d463ab66dc71ba4e10cbaae8f807f (diff) | |
| parent | 4855de123391daab82407b44de03ba5647e97694 (diff) | |
| download | git-43240cb7316a7ea653ada00adfddd5ea80f90cf3.tar.gz git-43240cb7316a7ea653ada00adfddd5ea80f90cf3.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4107-apply-ignore-whitespace.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4107-apply-ignore-whitespace.sh b/t/t4107-apply-ignore-whitespace.sh index 9e29b5262..ac72eeaf2 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 |