Merge branch 'jk/cherry-pick-0-mainline'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index c9585d475d90c41554465f870e530c16ab93199f..f78bb4818d7a5254d7c3c2c34d1f370cd3aa9327 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -148,7 +148,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
 
        ctx.fmt = CMIT_FMT_USERFORMAT;
        ctx.abbrev = log->abbrev;
-       ctx.subject = "";
+       ctx.print_email_subject = 1;
        ctx.after_subject = "";
        ctx.date_mode.type = DATE_NORMAL;
        ctx.output_encoding = get_log_output_encoding();