git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "H. Peter Anvin" <hpa@zytor.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Git Mailing List <git@vger.kernel.org>
Subject: Re: git am and the wrong chunk of ---
Date: Fri, 10 Aug 2012 09:39:21 -0700	[thread overview]
Message-ID: <50253939.7080908@zytor.com> (raw)
In-Reply-To: <7v628qlo53.fsf@alter.siamese.dyndns.org>

On 08/10/2012 09:15 AM, Junio C Hamano wrote:
> "H. Peter Anvin" <hpa@zytor.com> writes:
> 
>> The users I am referring to generally have a --- line, rather than
>> a scissor, between the cover text and commit.  Also, there is
>> (almost) always a From: line and subject at the top of the patch
>> proper.
> 
> Oh, so it is more like this?
> 
>     From: author name <author@address.xz>
>     Date: author date
>     Subject: patch title
> 
>     Heya,
> 
>     I was walking my dog when I found a solution to this
>     problem the other day.  Here it is.
> 
>     ---
>     >From 755e8b3f35e3991a735a6be740eda4567d45a741 Mon Sep 17 00:00:00 2001
>     From: author name <author@address.xz>
>     Date: random date we do not care
>     Subject: patch title
> 
>     commit message body
> 
>     ---
> 

That is exactly what I see, except usually with the mbox header.

However, it makes sense to me to treat From: as a scissor (we can then
ignore the preceding --- completely).

	-hpa

      reply	other threads:[~2012-08-10 16:40 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-10  0:13 git am and the wrong chunk of --- H. Peter Anvin
2012-08-10  1:26 ` Junio C Hamano
2012-08-10 10:36 ` Jeff King
2012-08-10 11:00   ` Andreas Ericsson
2012-08-10 14:46   ` Junio C Hamano
2012-08-10 14:48     ` H. Peter Anvin
2012-08-10 16:15       ` Junio C Hamano
2012-08-10 16:39         ` H. Peter Anvin [this message]

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=50253939.7080908@zytor.com \
    --to=hpa@zytor.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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).