diff options
author | Olivier Marin <dkr@freesurf.fr> | 2008-06-17 18:34:57 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-06-17 16:40:09 -0700 |
commit | 8c6b57860d9be5f346c9589a08c9e7c04eeaf99b (patch) | |
tree | a343d2f84314a6484ab5545d0810fafd655cad70 | |
parent | 1d9b26562e12fabd60bb4174b7e6b10f4f4a0ec8 (diff) | |
download | git-8c6b57860d9be5f346c9589a08c9e7c04eeaf99b.tar.gz git-8c6b57860d9be5f346c9589a08c9e7c04eeaf99b.tar.xz |
Fix approxidate("never") to always return 0
Commit af66366a9feb0194ed04b1f538998021ece268a8 introduced the keyword
"never" to be used with approxidate() but defined it with a fixed date
without taking care of timezone. As a result approxidate() will return
a timestamp in the future with a negative timezone.
With this patch, approxidate("never") always return 0 whatever your
timezone is.
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | date.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -682,10 +682,8 @@ static void date_am(struct tm *tm, int *num) static void date_never(struct tm *tm, int *num) { - tm->tm_mon = tm->tm_wday = tm->tm_yday - = tm->tm_hour = tm->tm_min = tm->tm_sec = 0; - tm->tm_year = 70; - tm->tm_mday = 1; + time_t n = 0; + localtime_r(&n, tm); } static const struct special { |