From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sat, 20 Jan 2007 21:21:38 +0000 (+0100)
Subject: show_date(): fix relative dates
X-Git-Tag: v1.5.0-rc2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da8f070cee6795594e4ac2af9f1e11cf9a7d3649;p=git.git

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>
---

diff --git a/date.c b/date.c
index 7acb8cbd9..542c004c2 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;