Merge branch 'dm/ni-maxhost-may-be-missing'

diff --git a/log-tree.c b/log-tree.c
index f8487f8a8a7694ce09f1b079c701bceabf688b20..5dc45c4812bdfd0d7a6b71d529eaa37df8178186 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -681,6 +681,7 @@ void show_log(struct rev_info *opt)
        ctx.preserve_subject = opt->preserve_subject;
        ctx.reflog_info = opt->reflog_info;
        ctx.fmt = opt->commit_format;
+       ctx.mailmap = opt->mailmap;
        ctx.color = opt->diffopt.use_color;
        pretty_print_commit(&ctx, commit, &msgbuf);