summaryrefslogtreecommitdiff
path: root/t/t4132-apply-removal.sh
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@ksplice.com>2010-09-29 16:49:49 -0400
committerJunio C Hamano <gitster@pobox.com>2010-10-13 16:39:45 -0700
commita1980c4efcfea516e2ba442bf7e56a39d9a7933f (patch)
treea1f0bbfe13af6e7d36e76e53646337c4f7b94d07 /t/t4132-apply-removal.sh
parent87b50542a08ac6caa083ddc376e674424e37940a (diff)
downloadgit-a1980c4efcfea516e2ba442bf7e56a39d9a7933f.tar.gz
apply: Recognize epoch timestamps with : in the timezone
Some patches have a timezone formatted like ‘-08:00’ instead of ‘-0800’ (e.g. http://lwn.net/Articles/131729/), so git apply would fail to recognize the epoch timestamp of deleted files and would create empty files instead. Teach it to support both formats, and add a test case. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4132-apply-removal.sh')
-rwxr-xr-xt/t4132-apply-removal.sh2
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