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>

diff --git a/cache.h b/cache.h
index 49713cc5a5a61bf0749e596b94474f00286dc652..8d97939c0db5713becc2a2c3b380db4d4e3e6b33 100644 (file)
--- 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);
 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);
                        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 9bc15df6f9dfa635fe91760914473d953b7c970b..61449f8b2e51507f148617120d455eefda19a406 100644 (file)
--- a/date.c
+++ b/date.c
@@ -107,9 +107,9 @@ static int local_tzoffset(timestamp_t time)
        return offset * eastwest;
 }
 
        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) {
 {
        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);
 
                strbuf_reset(&timebuf);
                gettimeofday(&now, NULL);

-               show_date_relative(time, tz, &now, &timebuf);
+               show_date_relative(time, &now, &timebuf);

                return timebuf.buf;
        }
 
                return timebuf.buf;
        }
 

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index a0837371aba17956331ddcdb04847c6c9edeefd2..aac4d542c2936bf90f5ef9c0f27ff347aaf8b660 100644 (file)
--- 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);
 
        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);
                printf("%s -> %s\n", *argv, buf.buf);
        }
        strbuf_release(&buf);