mailmap: add mailmap structure to rev_info and pp
Pass a mailmap from rev_info to pretty_print_context to so that the pretty printer can use rewritten name and email address when showing commits. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Antoine Pelisse committed
Jan 5, 2013 at 22:26 UTC
0e2913b042825cb3ff6798245f9224f41183d159
3 files changed
+3
commit.h
+1
@@ -89,6 +89,7 @@ struct pretty_print_context {
89
char *notes_message;
90
struct reflog_walk_info *reflog_info;
91
const char *output_encoding;
92
+ struct string_list *mailmap;
93
};
94
95
struct userformat_want {
log-tree.c
+1
@@ -671,6 +671,7 @@ void show_log(struct rev_info *opt)
671
ctx.preserve_subject = opt->preserve_subject;
672
ctx.reflog_info = opt->reflog_info;
673
ctx.fmt = opt->commit_format;
674
+ ctx.mailmap = opt->mailmap;
675
pretty_print_commit(&ctx, commit, &msgbuf);
676
677
if (opt->add_signoff)
revision.h
+1
@@ -143,6 +143,7 @@ struct rev_info {
143
const char *subject_prefix;
144
int no_inline;
145
int show_log_size;
146
+ struct string_list *mailmap;
147
148
/* Filter by commit log message */
149
struct grep_opt grep_filter;