diff options
| author | Jeff King <peff@peff.net> | 2013-07-03 03:08:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 12:11:04 -0700 |
| commit | a90804752f6ab2b911882d47fafb6c2b78f447c3 (patch) | |
| tree | ecf64fa9f0317643baf5fb9ec791729edee98ea5 /log-tree.c | |
| parent | 10f2fbff6859a22327d04f9eb0c1a38995ff48b1 (diff) | |
| download | git-a90804752f6ab2b911882d47fafb6c2b78f447c3.tar.gz | |
teach format-patch to place other authors into in-body "From"
Format-patch generates emails with the "From" address set to the
author of each patch. If you are going to send the emails, however,
you would want to replace the author identity with yours (if they
are not the same), and bump the author identity to an in-body
header.
Normally this is handled by git-send-email, which does the
transformation before sending out the emails. However, some
workflows may not use send-email (e.g., imap-send, or a custom
script which feeds the mbox to a non-git MUA). They could each
implement this feature themselves, but getting it right is
non-trivial (one must canonicalize the identities by reversing any
RFC2047 encoding or RFC822 quoting of the headers, which has caused
many bugs in send-email over the years).
This patch takes a different approach: it teaches format-patch a
"--from" option which handles the ident check and in-body header
while it is writing out the email. It's much simpler to do at this
level (because we haven't done any quoting yet), and any workflow
based on format-patch can easily turn it on.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 2eb69bcfed..67da27f909 100644 --- a/log-tree.c +++ b/log-tree.c @@ -617,6 +617,8 @@ void show_log(struct rev_info *opt) ctx.fmt = opt->commit_format; ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; + if (opt->from_ident.mail_begin && opt->from_ident.name_begin) + ctx.from_ident = &opt->from_ident; pretty_print_commit(&ctx, commit, &msgbuf); if (opt->add_signoff) |