Re: [PATCH] rebase-am: fix regression with new cover-letter config

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Apr 15, 2013, 02:31 UTC
Message-ID: <CAMP44s0GbocoBrONYdiN6f=qd58xbX0Y4neGSVRmCiLRr_f8Jw@mail.gmail.com>
In-Reply-To: <7vhaj84l8m.fsf@alter.siamese.dyndns.org>

On Sun, Apr 14, 2013 at 8:48 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> If you have a cover-letter configuration set to anything other than
>> 'false', 'git format-patch' might generate a cover letter, and 'git am'
>> doesn't seem to like that.
>>
>> Ideally 'git am' should skip the cover-letter, but for now lets just fix
>> the regression.
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>
> This is a follow-up to the fc/send-email-annotate topic, right?

Right.

Show 6 quoted lines

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

> Thanks for catching this before breaking the real world users.

I'm running 'next' as you suggested we should do, along with all my patches, so that helps :)

Cheers.

-- 
Felipe Contreras