Sync with maint

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index c0bab6aaa9755f5a0264601defd0414b0b458e17..007cc66a036429d602cf7afe19c163fcf6d06395 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -138,7 +138,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
                ctx.abbrev = log->abbrev;
                ctx.subject = "";
                ctx.after_subject = "";
-               ctx.date_mode = DATE_NORMAL;
+               ctx.date_mode.type = DATE_NORMAL;
                ctx.output_encoding = get_log_output_encoding();
                pretty_print_commit(&ctx, commit, &ufbuf);
                buffer = ufbuf.buf;