diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:40 -0700 |
| commit | 22fcbc420e7948cadb42c923810609a5e4b730a4 (patch) | |
| tree | 98af691dffb868dcce816e514e6fd81220ffdc7b /log-tree.c | |
| parent | 9678ee7ba30a76b0b5c613126e659dcb1a206091 (diff) | |
| parent | a90804752f6ab2b911882d47fafb6c2b78f447c3 (diff) | |
| download | git-22fcbc420e7948cadb42c923810609a5e4b730a4.tar.gz git-22fcbc420e7948cadb42c923810609a5e4b730a4.tar.xz | |
Merge branch 'jk/format-patch-from'
"git format-patch" learned "--from[=whom]" option, which sets the
"From: " header to the specified person (or the person who runs the
command, if "=whom" part is missing) and move the original author
information to an in-body From: header as necessary.
* jk/format-patch-from:
teach format-patch to place other authors into in-body "From"
pretty.c: drop const-ness from pretty_print_context
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 60f32a396..a49d8e895 100644 --- a/log-tree.c +++ b/log-tree.c @@ -618,6 +618,8 @@ void show_log(struct rev_info *opt) ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; ctx.output_encoding = get_log_output_encoding(); + 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) |