summaryrefslogtreecommitdiff
path: root/date.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-07 01:14:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-07 01:14:47 (GMT)
commit6ba649e4085bd7b8c80fd2080ca003bf450c9f53 (patch)
treeae506d2c343a66ce4192d4587219acd59006e797 /date.c
parenteb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96 (diff)
parent3b702239d6399685aa69539b83be5f744cfa10e3 (diff)
downloadgit-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.zip
git-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.tar.gz
git-6ba649e4085bd7b8c80fd2080ca003bf450c9f53.tar.bz2
Merge branch 'ab/strbuf-addftime-tzname-boolify'
strbuf_addftime() is further getting tweaked. * ab/strbuf-addftime-tzname-boolify: strbuf: change an always NULL/"" strbuf_addftime() param to bool strbuf.h comment: discuss strbuf_addftime() arguments in order
Diffstat (limited to 'date.c')
-rw-r--r--date.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/date.c b/date.c
index 1fd6d66..c3e673f 100644
--- a/date.c
+++ b/date.c
@@ -256,7 +256,7 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
else if (mode->type == DATE_STRFTIME)
strbuf_addftime(&timebuf, mode->strftime_fmt, tm, tz,
- mode->local ? NULL : "");
+ !mode->local);
else
strbuf_addf(&timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
weekday_names[tm->tm_wday],