From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config
Date: Sun, 14 Apr 2013 21:31:26 -0500 [thread overview]
Message-ID: <CAMP44s0GbocoBrONYdiN6f=qd58xbX0Y4neGSVRmCiLRr_f8Jw@mail.gmail.com> (raw)
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:
> 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.
> 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
next prev parent reply other threads:[~2013-04-15 2:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-14 22:27 [PATCH] rebase-am: fix regression with new cover-letter config Felipe Contreras
2013-04-15 1:48 ` Junio C Hamano
2013-04-15 2:31 ` Felipe Contreras [this message]
2013-04-15 2:51 ` Junio C Hamano
2013-04-15 2:57 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMP44s0GbocoBrONYdiN6f=qd58xbX0Y4neGSVRmCiLRr_f8Jw@mail.gmail.com' \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).