From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Jul 2013 17:28:39 +0000 (-0700)
Subject: Merge branch 'jk/format-patch-from'
X-Git-Tag: v1.8.4-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/22fcbc420e7948cadb42c923810609a5e4b730a4

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
---

22fcbc420e7948cadb42c923810609a5e4b730a4
diff --cc log-tree.c
index 60f32a3965,67da27f909..a49d8e895d
--- a/log-tree.c
+++ b/log-tree.c
@@@ -617,7 -617,8 +617,9 @@@ void show_log(struct rev_info *opt
  	ctx.fmt = opt->commit_format;
  	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)