summaryrefslogtreecommitdiff
path: root/date.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-30 22:21:57 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-30 22:21:57 (GMT)
commit92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47 (patch)
tree3adb7cc8ac221e327b1a3afd5f7f83514dfc6ca8 /date.c
parent5e2a78a4101ec1dafb885c989cc0f958c0de9222 (diff)
downloadgit-92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47.zip
git-92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47.tar.gz
git-92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47.tar.bz2
date.c: only use the TZ names if we don't have anything better.
Also, add EEST (hey, it's Finland).
Diffstat (limited to 'date.c')
-rw-r--r--date.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/date.c b/date.c
index 0022bf2..d3bae90 100644
--- a/date.c
+++ b/date.c
@@ -82,6 +82,7 @@ static const struct {
{ "FWT", +1, 0, }, /* French Winter */
{ "FST", +1, 1, }, /* French Summer */
{ "EET", +2, 0, }, /* Eastern Europe, USSR Zone 1 */
+ { "EEST", +2, 1, }, /* Eastern European Daylight */
{ "WAST", +7, 0, }, /* West Australian Standard */
{ "WADT", +7, 1, }, /* West Australian Daylight */
{ "CCT", +8, 0, }, /* China Coast, USSR Zone 7 */
@@ -144,7 +145,10 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
/* This is bogus, but we like summer */
off += timezone_names[i].dst;
- *offset = 60*off;
+ /* Only use the tz name offset if we don't have anything better */
+ if (*offset == -1)
+ *offset = 60*off;
+
return match;
}
}