diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:23:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:23:50 -0700 |
| commit | 7b676b1bb53c936770a07354ec6c6550fb31b421 (patch) | |
| tree | ee46af290fec7e3bdf30b5759a887928c9a15147 /t/t4104-apply-boundary.sh | |
| parent | 846b8f681a0a75cec2b930007c84e98346940459 (diff) | |
| parent | 59f5ced65b46370a121916593cce7fcd210a15df (diff) | |
| download | git-7b676b1bb53c936770a07354ec6c6550fb31b421.tar.gz git-7b676b1bb53c936770a07354ec6c6550fb31b421.tar.xz | |
Merge branch 'bg/apply-fix-blank-at-eof' into maint
* bg/apply-fix-blank-at-eof:
t3417: Add test cases for "rebase --whitespace=fix"
t4124: Add additional tests of --whitespace=fix
apply: Allow blank context lines to match beyond EOF
apply: Remove the quick rejection test
apply: Don't unnecessarily update line lengths in the preimage
Diffstat (limited to 't/t4104-apply-boundary.sh')
| -rwxr-xr-x | t/t4104-apply-boundary.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index 0e3ce3611..c617c2a33 100755 --- a/t/t4104-apply-boundary.sh +++ b/t/t4104-apply-boundary.sh @@ -134,4 +134,13 @@ test_expect_success 'two lines' ' ' +test_expect_success 'apply patch with 3 context lines matching at end' ' + { echo a; echo b; echo c; echo d; } >file && + git add file && + echo e >>file && + git diff >patch && + >file && + test_must_fail git apply patch +' + test_done |