summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-01-24 13:12:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-24 20:35:44 (GMT)
commit3d42034a18297bc014e2132121c4854f5a07fe4c (patch)
treef31607df181152d666d13bfb4100186b8e7fc70b
parentacbf33f8462bb96d18168da85df8ba9ba01015d6 (diff)
downloadgit-3d42034a18297bc014e2132121c4854f5a07fe4c.zip
git-3d42034a18297bc014e2132121c4854f5a07fe4c.tar.gz
git-3d42034a18297bc014e2132121c4854f5a07fe4c.tar.bz2
show_date_relative(): drop unused "tz" parameter
The timestamp we receive is in epoch time, so there's no need for a timezone parameter to interpret it. The matching show_date() uses "tz" to show dates in author local time, but relative dates show only the absolute time difference. The author's location is irrelevant, barring relativistic effects from using Git close to the speed of light. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
-rw-r--r--date.c8
-rw-r--r--t/helper/test-date.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/cache.h b/cache.h
index 49713cc..8d97939 100644
--- a/cache.h
+++ b/cache.h
@@ -1464,7 +1464,7 @@ struct date_mode {
struct date_mode *date_mode_from_type(enum date_mode_type type);
const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
-void show_date_relative(timestamp_t time, int tz, const struct timeval *now,
+void show_date_relative(timestamp_t time, const struct timeval *now,
struct strbuf *timebuf);
int parse_date(const char *date, struct strbuf *out);
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
diff --git a/date.c b/date.c
index 9bc15df..61449f8 100644
--- a/date.c
+++ b/date.c
@@ -107,9 +107,9 @@ static int local_tzoffset(timestamp_t time)
return offset * eastwest;
}
-void show_date_relative(timestamp_t time, int tz,
- const struct timeval *now,
- struct strbuf *timebuf)
+void show_date_relative(timestamp_t time,
+ const struct timeval *now,
+ struct strbuf *timebuf)
{
timestamp_t diff;
if (now->tv_sec < time) {
@@ -216,7 +216,7 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
strbuf_reset(&timebuf);
gettimeofday(&now, NULL);
- show_date_relative(time, tz, &now, &timebuf);
+ show_date_relative(time, &now, &timebuf);
return timebuf.buf;
}
diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index a083737..aac4d54 100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -16,7 +16,7 @@ static void show_relative_dates(const char **argv, struct timeval *now)
for (; *argv; argv++) {
time_t t = atoi(*argv);
- show_date_relative(t, 0, now, &buf);
+ show_date_relative(t, now, &buf);
printf("%s -> %s\n", *argv, buf.buf);
}
strbuf_release(&buf);