diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-07 03:04:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-07 03:04:29 (GMT) |
| commit | a1c0dca43a3513574e5bebb38989671960cdaf35 (patch) | |
| tree | f67bb600dd5da2c3038dff2948a70f267cf237b2 /t | |
| parent | aba201c6e8d9934157b9ba39b8e6b54c2fa7b6e1 (diff) | |
| parent | ee5a317e0130ab2db59db97c644576335530512d (diff) | |
| download | git-a1c0dca43a3513574e5bebb38989671960cdaf35.zip git-a1c0dca43a3513574e5bebb38989671960cdaf35.tar.gz git-a1c0dca43a3513574e5bebb38989671960cdaf35.tar.bz2 | |
Merge branch 'jc/maint-apply-match-beginning'
* jc/maint-apply-match-beginning:
Fix "git apply" to correctly enforce "match at the beginning"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4104-apply-boundary.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index 64f34e3..43943ab 100755 --- a/t/t4104-apply-boundary.sh +++ b/t/t4104-apply-boundary.sh @@ -112,4 +112,17 @@ do ' done +test_expect_success 'two lines' ' + + >file && + git add file && + echo aaa >file && + git diff >patch && + git add file && + echo bbb >file && + git add file && + test_must_fail git apply --check patch + +' + test_done |