Re: [RFC/PATCH] mailinfo: do not treat ">From" lines as in-body headers

From: Jeff King <peff@peff.net>
Date: Sep 16, 2014, 00:19 UTC
Message-ID: <20140916001948.GC5019@peff.net>
In-Reply-To: <xmqq1trc63o8.fsf@gitster.dls.corp.google.com>

On Mon, Sep 15, 2014 at 01:15:35PM -0700, Junio C Hamano wrote:

Show 6 quoted lines

> > If we only want to skip ">?From" in pasted format-patch output, we
> > would want a rule in mailinfo that is tighter than is_from_line() in
> > mailsplit.
> 
> That is, something like this on top of your patch.  Or is this a bit
> too strict?

The only cases that I can think of that would be a problem with this strictness are:

  1. Somebody writes format-patch output to a file, reads in the mbox
     using another program, and then writes out the result (munging the
     mbox From line). And then pastes the whole thing into their email
     body.

     I can see the first part happening. But given that it is totally
     irrelevant _unless_ they then screw up and paste the From line in
     the body (which is already a corner case), it probably doesn't
     matter.

  2. We change the static From lines that git generates. We can always
     update the parser, of course, but it may be running a different
     version of git than the sender.  People with an old git running
     "git am" would stop skipping past "From" lines in messages from
     people on newer gits.

Again, this eating of the in-body "From" line is already a corner case, so it's not the end of the world if it breaks in a few cases. But I'd also be fine with just leaving it looser.

Show 6 quoted lines

>  Makefile            |  1 +
>  builtin/mailinfo.c  |  3 ++-
>  builtin/mailsplit.c |  1 +
>  cache.h             |  6 ------
>  mbox.c              | 15 +++++++++++++++
>  5 files changed, 19 insertions(+), 7 deletions(-)

I think you forgot to "git add" mbox.h. That being said, if we did go this route, I do not see any reason to share the code at all. This can be purely a mailinfo.c thing.

-Peff