Merge branch 'rs/t4062-obsd' into next

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 677f372083c0f726b0d773ca502a4d6e09cb98eb..43c4799ea9a9d963f9a44be5cd0ee5bc511e73df 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "diff.h"
 #include "string-list.h"
@@ -148,7 +149,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();