From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:44:14 +0000 (-0700)
Subject: Merge branch 'jk/tzoffset-fix' into maint
X-Git-Tag: v2.9.1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c72d6da31dd6ffce56989e4bcbd1b8650b1ef25

Merge branch 'jk/tzoffset-fix' into maint

The internal code used to show local timezone offset is not
prepared to handle timestamps beyond year 2100, and gave a
bogus offset value to the caller.  Use a more benign looking
+0000 instead and let "git log" going in such a case, instead
of aborting.

* jk/tzoffset-fix:
local_tzoffset: detect errors from tm_to_time_t
t0006: test various date formats
t0006: rename test-date's "show" to "relative"
---

0c72d6da31dd6ffce56989e4bcbd1b8650b1ef25
diff --cc t/helper/test-date.c
index 63f373557e,0000000000..d9ab360909
mode 100644,000000..100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@@ -1,73 -1,0 +1,99 @@@
 +#include "cache.h"
 +
 +static const char *usage_msg = "\n"
- "  test-date show [time_t]...\n"
++"  test-date relative [time_t]...\n"
++"  test-date show:<format> [time_t]...\n"
 +"  test-date parse [date]...\n"
 +"  test-date approxidate [date]...\n";
 +
- static void show_dates(char **argv, struct timeval *now)
++static void show_relative_dates(char **argv, struct timeval *now)
 +{
 +	struct strbuf buf = STRBUF_INIT;
 +
 +	for (; *argv; argv++) {
 +		time_t t = atoi(*argv);
 +		show_date_relative(t, 0, now, &buf);
 +		printf("%s -> %s\n", *argv, buf.buf);
 +	}
 +	strbuf_release(&buf);
 +}
 +
++static void show_dates(char **argv, const char *format)
++{
++	struct date_mode mode;
++
++	parse_date_format(format, &mode);
++	for (; *argv; argv++) {
++		char *arg = *argv;
++		time_t t;
++		int tz;
++
++		/*
++		 * Do not use our normal timestamp parsing here, as the point
++		 * is to test the formatting code in isolation.
++		 */
++		t = strtol(arg, &arg, 10);
++		while (*arg == ' ')
++			arg++;
++		tz = atoi(arg);
++
++		printf("%s -> %s\n", *argv, show_date(t, tz, &mode));
++	}
++}
++
 +static void parse_dates(char **argv, struct timeval *now)
 +{
 +	struct strbuf result = STRBUF_INIT;
 +
 +	for (; *argv; argv++) {
 +		unsigned long t;
 +		int tz;
 +
 +		strbuf_reset(&result);
 +		parse_date(*argv, &result);
 +		if (sscanf(result.buf, "%lu %d", &t, &tz) == 2)
 +			printf("%s -> %s\n",
 +			       *argv, show_date(t, tz, DATE_MODE(ISO8601)));
 +		else
 +			printf("%s -> bad\n", *argv);
 +	}
 +	strbuf_release(&result);
 +}
 +
 +static void parse_approxidate(char **argv, struct timeval *now)
 +{
 +	for (; *argv; argv++) {
 +		time_t t;
 +		t = approxidate_relative(*argv, now);
 +		printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
 +	}
 +}
 +
 +int main(int argc, char **argv)
 +{
 +	struct timeval now;
 +	const char *x;
 +
 +	x = getenv("TEST_DATE_NOW");
 +	if (x) {
 +		now.tv_sec = atoi(x);
 +		now.tv_usec = 0;
 +	}
 +	else
 +		gettimeofday(&now, NULL);
 +
 +	argv++;
 +	if (!*argv)
 +		usage(usage_msg);
- 	if (!strcmp(*argv, "show"))
- 		show_dates(argv+1, &now);
++	if (!strcmp(*argv, "relative"))
++		show_relative_dates(argv+1, &now);
++	else if (skip_prefix(*argv, "show:", &x))
++		show_dates(argv+1, x);
 +	else if (!strcmp(*argv, "parse"))
 +		parse_dates(argv+1, &now);
 +	else if (!strcmp(*argv, "approxidate"))
 +		parse_approxidate(argv+1, &now);
 +	else
 +		usage(usage_msg);
 +	return 0;
 +}