From: Antoine Pelisse <apelisse@gmail.com>
To: git@vger.kernel.org
Cc: Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH v2 4/7] mailmap: Add mailmap structure to rev_info and pp
Date: Sat, 15 Dec 2012 19:05:51 +0100 [thread overview]
Message-ID: <1355594754-27589-5-git-send-email-apelisse@gmail.com> (raw)
In-Reply-To: <1355594754-27589-1-git-send-email-apelisse@gmail.com>
the mailmap string_list structure filled with mailmap
information is passed along from rev_info to pretty_print_context
to provide mailmap information to pretty print each commits
with the correct username and email.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
---
commit.h | 1 +
log-tree.c | 1 +
revision.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/commit.h b/commit.h
index b6ad8f3..7f8f987 100644
--- a/commit.h
+++ b/commit.h
@@ -89,6 +89,7 @@ struct pretty_print_context {
char *notes_message;
struct reflog_walk_info *reflog_info;
const char *output_encoding;
+ struct string_list *mailmap;
};
struct userformat_want {
diff --git a/log-tree.c b/log-tree.c
index 4f86def..92254fd 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -671,6 +671,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;
pretty_print_commit(&ctx, commit, &msgbuf);
if (opt->add_signoff)
diff --git a/revision.h b/revision.h
index 059bfff..83a79f5 100644
--- a/revision.h
+++ b/revision.h
@@ -143,6 +143,7 @@ struct rev_info {
const char *subject_prefix;
int no_inline;
int show_log_size;
+ struct string_list *mailmap;
/* Filter by commit log message */
struct grep_opt grep_filter;
--
1.7.9.5
next prev parent reply other threads:[~2012-12-15 18:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-15 18:05 [PATCH v2 0/7] Allow git log to use mailmap file Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 1/7] Use split_ident_line to parse author and committer Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 2/7] mailmap: Remove buffer length limit in map_user Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 3/7] mailmap: Simplify map_user() interface Antoine Pelisse
2012-12-15 18:05 ` Antoine Pelisse [this message]
2012-12-15 18:05 ` [PATCH v2 5/7] pretty: Use mailmap to display username and email Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 6/7] log: Add --use-mailmap option Antoine Pelisse
2012-12-15 18:05 ` [PATCH v2 7/7] test: Add test for " Antoine Pelisse
2012-12-15 20:18 ` [PATCH v2 0/7] Allow git log to use mailmap file Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355594754-27589-5-git-send-email-apelisse@gmail.com \
--to=apelisse@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).