diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:31 -0800 |
| commit | f565f6e06511249c8c3690277023a8550dbdfb47 (patch) | |
| tree | b2e897cd8dc1539ad3f27d78282f55ff4efd2418 /t/t4135-apply-weird-filenames.sh | |
| parent | Merge branch 'tc/smart-http-post-redirect' (diff) | |
| parent | apply: handle patches with funny filename and colon in timezone (diff) | |
| download | tgif-f565f6e06511249c8c3690277023a8550dbdfb47.tar.xz | |
Merge branch 'ak/apply-non-git-epoch'
* ak/apply-non-git-epoch:
apply: handle patches with funny filename and colon in timezone
apply: Recognize epoch timestamps with : in the timezone
Diffstat (limited to 't/t4135-apply-weird-filenames.sh')
| -rwxr-xr-x | t/t4135-apply-weird-filenames.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh index 1e5aad57ab..bf5dc57286 100755 --- a/t/t4135-apply-weird-filenames.sh +++ b/t/t4135-apply-weird-filenames.sh @@ -72,4 +72,20 @@ test_expect_success 'whitespace-damaged traditional patch' ' test_cmp expected postimage.txt ' +test_expect_success 'traditional patch with colon in timezone' ' + echo postimage >expected && + reset_preimage && + rm -f "post image.txt" && + git apply "$vector/funny-tz.diff" && + test_cmp expected "post image.txt" +' + +test_expect_success 'traditional, whitespace-damaged, colon in timezone' ' + echo postimage >expected && + reset_preimage && + rm -f "post image.txt" && + git apply "$vector/damaged-tz.diff" && + test_cmp expected "post image.txt" +' + test_done |