Merge branch 'rj/sparse-flags'

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 792a80537467bd7c759754fea5fb226697c5d633..b3253803ac8ce66625e346fcbce3ca9c9a16ae55 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -3,6 +3,7 @@
 
 static const char *usage_msg = "\n"
 "  test-tool date relative [time_t]...\n"
+"  test-tool date human [time_t]...\n"
 "  test-tool date show:<format> [time_t]...\n"
 "  test-tool date parse [date]...\n"
 "  test-tool date approxidate [date]...\n"
@@ -17,12 +18,20 @@ 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);
 }
 
+static void show_human_dates(const char **argv)
+{
+       for (; *argv; argv++) {
+               time_t t = atoi(*argv);
+               printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(HUMAN)));
+       }
+}
+
 static void show_dates(const char **argv, const char *format)
 {
        struct date_mode mode;
@@ -83,7 +92,7 @@ static void parse_approx_timestamp(const char **argv, struct timeval *now)
        }
 }
 
-static void getnanos(const char **argv, struct timeval *now)
+static void getnanos(const char **argv)
 {
        double seconds = getnanotime() / 1.0e9;
 
@@ -97,7 +106,7 @@ int cmd__date(int argc, const char **argv)
        struct timeval now;
        const char *x;
 
-       x = getenv("TEST_DATE_NOW");
+       x = getenv("GIT_TEST_DATE_NOW");
        if (x) {
                now.tv_sec = atoi(x);
                now.tv_usec = 0;
@@ -110,6 +119,8 @@ int cmd__date(int argc, const char **argv)
                usage(usage_msg);
        if (!strcmp(*argv, "relative"))
                show_relative_dates(argv+1, &now);
+       else if (!strcmp(*argv, "human"))
+               show_human_dates(argv+1);
        else if (skip_prefix(*argv, "show:", &x))
                show_dates(argv+1, x);
        else if (!strcmp(*argv, "parse"))
@@ -119,7 +130,7 @@ int cmd__date(int argc, const char **argv)
        else if (!strcmp(*argv, "timestamp"))
                parse_approx_timestamp(argv+1, &now);
        else if (!strcmp(*argv, "getnanos"))
-               getnanos(argv+1, &now);
+               getnanos(argv+1);
        else if (!strcmp(*argv, "is64bit"))
                return sizeof(timestamp_t) == 8 ? 0 : 1;
        else if (!strcmp(*argv, "time_t-is64bit"))