From: Junio C Hamano Date: Mon, 15 Apr 2013 02:51:02 GMT Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: <7v1uac4icp.fsf@alter.siamese.dyndns.org> In-Reply-To: Felipe Contreras writes: >> You are mean to say "fix regression", which gave me a small heart >> attack ;-). I was worried if we had already merged it to 'next'. >> >> As I already wrote in the recent "What's cooking", the series looks >> good to me. I am inclined to say that we should merge it (together >> with this update) to 'next'. > > Yeah, after thinking about it, it's not even really a regression, > because people don't have format.coverletter=auto in their configs > (yet), so the bug can't can possibly affect them. Here is what I tentatively queued. rebase-am: explicitly disable cover-letter If the user has a cover-letter configuration set to anything other than 'false', 'git format-patch' may generate a cover letter, which has no place in "format-patch | am" pipeline. The internal invocatoin of format-patch must explicitly override the configuration from the command line, just like --src-prefix and other options already do. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano