Merge branch 'jk/shortlog-tolerate-broken-commit' into maint

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index dca7fa1f91cecacba9e09dff9875260f08a79386..84ffbb798e2e0ec8c1121790c04ccbb58b05e591 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -139,6 +139,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
                ctx.subject = "";
                ctx.after_subject = "";
                ctx.date_mode = DATE_NORMAL;
+               ctx.output_encoding = get_log_output_encoding();
                pretty_print_commit(&ctx, commit, &ufbuf);
                buffer = ufbuf.buf;
        } else if (*buffer) {