From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Oct 2015 20:59:23 +0000 (-0700)
Subject: Merge branch 'jc/am-mailinfo-direct'
X-Git-Tag: v2.7.0-rc0~63
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/95b86a60cfe36055671006aa06c8d9ef27cb5bd6?hp=--cc

Merge branch 'jc/am-mailinfo-direct'

"git am" used to spawn "git mailinfo" via run_command() API once
per each patch, but learned to make a direct call to mailinfo()
instead.

* jc/am-mailinfo-direct:
am: make direct call to mailinfo
---

95b86a60cfe36055671006aa06c8d9ef27cb5bd6
diff --cc builtin/am.c
index 4e396c8321,1873307f9e..f1a25ab6ad
--- a/builtin/am.c
+++ b/builtin/am.c
@@@ -1341,9 -1345,8 +1345,8 @@@ static int parse_mail(struct am_state *
  	}
  
  	strbuf_addstr(&msg, "\n\n");
- 	if (strbuf_read_file(&msg, am_path(state, "msg"), 0) < 0)
- 		die_errno(_("could not read '%s'"), am_path(state, "msg"));
+ 	strbuf_addbuf(&msg, &mi.log_message);
 -	stripspace(&msg, 0);
 +	strbuf_stripspace(&msg, 0);
  
  	if (state->signoff)
  		am_signoff(&msg);