Merge branch 'jk/diff-blob' into maint

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 677f372083c0f726b0d773ca502a4d6e09cb98eb..7cff1839fc15f46d58c9f78361f362d1d790cbd9 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.date_mode.type = DATE_NORMAL;
        ctx.output_encoding = get_log_output_encoding();