cherry-pick/revert: reject --rerere-autoupdate when continuing

diff --git a/date.c b/date.c
index 1fd6d663758de5a4b9d7f395b16716864317ed84..c3e673fd04221bb444e357ac01a1fe5984375daf 100644 (file)
--- 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],