Merge branch 'nd/gc-lock-against-each-other'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 1fd6f8ac5977ee670bf8ba230cec8553393baafd..1434f8fee487751abe069250c611bdaed2fa5857 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -137,6 +137,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) {