Hi Junio,
On Tue, 13 Jun 2017, Junio C Hamano wrote:
> * rs/strbuf-addftime-zZ (2017-06-10) 2 commits
> - date: use localtime() for "-local" time formats
> - strbuf: let strbuf_addftime handle %z and %Z itself
>
> As there is no portable way to pass timezone information to
> strftime, some output format from "git log" and friends are
> impossible to produce. Teach our own strbuf_addftime to replace %z
> and %Z with caller-supplied values to help working around this.
>
> Will merge to 'next'.
Hold on. Have you tried to build this branch?
-- snip --
CC date.o
date.c:63:36: error: unknown type name ‘timestamp_t’
static struct tm *time_to_tm_local(timestamp_t time)
^
date.c: In function ‘show_date’:
date.c:211:8: error: implicit declaration of function ‘time_to_tm_local’
[-Werror=implicit-function-declaration]
tm = time_to_tm_local(time);
^
date.c:211:6: error: assignment makes pointer from integer without a cast
[-Werror=int-conversion]
tm = time_to_tm_local(time);
^
cc1: all warnings being treated as errors
-- snap --
I would expect this to be rebased *at least* to dddbad728c9 (timestamp_t:
a new data type for timestamps, 2017-04-26).
But even then, it fails in t0006 on Windows with this error:
-- snip --
++ eval 'diff -u "$@" '
+++ diff -u expect actual
--- expect 2017-06-14 10:53:40.126136900 +0000
+++ actual 2017-06-14 10:53:40.171146800 +0000
@@ -1 +1 @@
-1466000000 +0200 -> 2016-06-15 14:13:20 +0000 (UTC)
+1466000000 +0200 -> 2016-06-15 14:13:20 UTC (UTC)
+ test_eval_ret_=1
+ want_trace
+ test t = t
+ test t = t
+ set +x
error: last command exited with $?=1
not ok 23 - show date (format-local:%Y-%m-%d %H:%M:%S %z (%Z):1466000000 +0200)
#
# echo "$time -> $expect" >expect &&
# (
# if test -n "$zone"
# then
# TZ=$zone
# export $TZ
# fi &&
# test-date show:"$format" "$time" >actual
# ) &&
# test_cmp expect actual
-- snap --
What gives?
Ciao,
Dscho
