diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:35 -0700 |
| commit | 31fbae0f813b47801ee79a464a8257346a5f8f2c (patch) | |
| tree | c592774728ed75406480d5d21fa4fdf61ef1cf61 /t/t4104-apply-boundary.sh | |
| parent | Merge branch 'bw/union-merge-refactor' (diff) | |
| parent | t3417: Add test cases for "rebase --whitespace=fix" (diff) | |
| download | tgif-31fbae0f813b47801ee79a464a8257346a5f8f2c.tar.xz | |
Merge branch 'bg/apply-fix-blank-at-eof'
* 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 0e3ce3611d..c617c2a33d 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 |