date: make "iso-strict" conforming for the UTC timezone
ISO 8601-1:2020-12 specifies that a zero timezone offset must be denoted with a "Z" suffix instead of the numeric "+00:00". Add the correponding special case to show_date() and a new test. Changing an established output format which might be depended on by scripts is always problematic, but here we choose to adhere more closely to the published standard. Reported-by: Michael Osipov <michael.osipov@innomotics.com> Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Beat Bolli committed
Mar 13, 2024 at 23:54 UTC
69e2bee1a3ba2f9367d55992f401e6365be100ea
2 files changed
+10
-5
date.c
+9
-5
@@ -342,14 +342,18 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
342
tm->tm_hour, tm->tm_min, tm->tm_sec,
343
tz);
344
else if (mode->type == DATE_ISO8601_STRICT) {
345
- char sign = (tz >= 0) ? '+' : '-';
346
- tz = abs(tz);
347
- strbuf_addf(&timebuf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
345
+ strbuf_addf(&timebuf, "%04d-%02d-%02dT%02d:%02d:%02d",
346
tm->tm_year + 1900,
347
tm->tm_mon + 1,
348
tm->tm_mday,
351
- tm->tm_hour, tm->tm_min, tm->tm_sec,
352
- sign, tz / 100, tz % 100);
349
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
350
+ if (tz == 0) {
351
+ strbuf_addch(&timebuf, 'Z');
352
+ } else {
353
+ strbuf_addch(&timebuf, tz >= 0 ? '+' : '-');
354
+ tz = abs(tz);
355
+ strbuf_addf(&timebuf, "%02d:%02d", tz / 100, tz % 100);
356
+ }
357
} else if (mode->type == DATE_RFC2822)
358
strbuf_addf(&timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
359
weekday_names[tm->tm_wday], tm->tm_mday,
t/t0006-date.sh
+1
@@ -46,6 +46,7 @@ check_show () {
46
TIME='1466000000 +0200'
47
check_show iso8601 "$TIME" '2016-06-15 16:13:20 +0200'
48
check_show iso8601-strict "$TIME" '2016-06-15T16:13:20+02:00'
49
+check_show iso8601-strict "$(echo "$TIME" | sed 's/+0200$/+0000/')" '2016-06-15T14:13:20Z'
50
check_show rfc2822 "$TIME" 'Wed, 15 Jun 2016 16:13:20 +0200'
51
check_show short "$TIME" '2016-06-15'
52
check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200'