[PATCH] apply: Recognize epoch timestamps with : in the timezone
- From
Anders Kaseorg <andersk@ksplice.com>
- Date
- Sep 29, 2010, 20:49 UTC
- Message-ID
- <alpine.DEB.2.00.1009291644440.15192@dr-wily.mit.edu>
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> --- builtin/apply.c | 6 ++++-- t/t4132-apply-removal.sh | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c index 23c18c5..0fa9a8d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -733,7 +733,7 @@ static int has_epoch_timestamp(const char *nameline) " " "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" " " - "([-+][0-2][0-9][0-5][0-9])\n"; + "([-+][0-2][0-9]):?([0-5][0-9])\n"; const char *timestamp = NULL, *cp; static regex_t *stamp; regmatch_t m[10]; @@ -765,7 +765,9 @@ static int has_epoch_timestamp(const char *nameline) } zoneoffset = strtol(timestamp + m[3].rm_so + 1, NULL, 10); - zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); + if (m[4].rm_so == m[3].rm_so + 3) + zoneoffset /= 100; + zoneoffset = zoneoffset * 60 + strtol(timestamp + m[4].rm_so, NULL, 10); if (timestamp[m[3].rm_so] == '-') zoneoffset = -zoneoffset; diff --git a/t/t4132-apply-removal.sh b/t/t4132-apply-removal.sh index bb1ffe3..a2bc1cd 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
-- 1.7.3