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/t4132-apply-removal.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/t4132-apply-removal.sh')
| -rwxr-xr-x | t/t4132-apply-removal.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4132-apply-removal.sh b/t/t4132-apply-removal.sh index bb1ffe3b6c..a2bc1cd37d 100755 --- a/t/t4132-apply-removal.sh +++ b/t/t4132-apply-removal.sh @@ -30,6 +30,7 @@ test_expect_success setup ' epocWest="1969-12-31 16:00:00.000000000 -0800" && epocGMT="1970-01-01 00:00:00.000000000 +0000" && epocEast="1970-01-01 09:00:00.000000000 +0900" && + epocWest2="1969-12-31 16:00:00 -08:00" && sed -e "s/TS0/$epocWest/" -e "s/TS1/$timeWest/" <c >createWest.patch && sed -e "s/TS0/$epocEast/" -e "s/TS1/$timeEast/" <c >createEast.patch && @@ -46,6 +47,7 @@ test_expect_success setup ' sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest/" <d >removeWest.patch && sed -e "s/TS0/$timeEast/" -e "s/TS1/$epocEast/" <d >removeEast.patch && sed -e "s/TS0/$timeGMT/" -e "s/TS1/$epocGMT/" <d >removeGMT.patch && + sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest2/" <d >removeWest2.patch && echo something >something && >empty |