summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-01-20 22:21:38 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-20 18:57:47 -0800
commitda8f070cee6795594e4ac2af9f1e11cf9a7d3649 (patch)
treee8c9788ff2a1c2e6ba1f51a303742f6e62f27c66
parentshow-branch --reflog: tighten input validation. (diff)
downloadtgif-da8f070cee6795594e4ac2af9f1e11cf9a7d3649.tar.xz
show_date(): fix relative dates
We pass a timestamp (i.e. number of seconds elapsed since Jan 1 1970, 00:00:00 GMT) to the function. So there is no need to "fix" the timestamp according to the timezone. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
-rw-r--r--date.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/date.c b/date.c
index 7acb8cbd91..542c004c2e 100644
--- a/date.c
+++ b/date.c
@@ -62,12 +62,11 @@ const char *show_date(unsigned long time, int tz, int relative)
if (relative) {
unsigned long diff;
- time_t t = gm_time_t(time, tz);
struct timeval now;
gettimeofday(&now, NULL);
- if (now.tv_sec < t)
+ if (now.tv_sec < time)
return "in the future";
- diff = now.tv_sec - t;
+ diff = now.tv_sec - time;
if (diff < 90) {
snprintf(timebuf, sizeof(timebuf), "%lu seconds ago", diff);
return timebuf;