git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-applymbox broken?

From
Eric W. Biederman <ebiederm@xmission.com>
Date
Jun 11, 2006, 23:33 UTC
Message-ID
<m1wtbn468o.fsf@ebiederm.dsl.xmission.com>
In-Reply-To
<Pine.LNX.4.64.0606111535310.5498@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 5 quoted lines
> It looks like something has broken git-applymbox lately.
>
> The "From: authorname" lines are no longer removed from the message, and 
> are duplicated in the commit log. This has resulted in several recent 
> kernel commits looking like this:

Agreed. That isn't terribly desirable. Do you have the original email message some place?

There is an odd case where if someone put the From: header in the middle of the text that we now notice and process and I didn't feel right about removing a line from the middle of the text.

I was fixing a nasty corner case that happens if there aren't any mail headers at all passed to git-mailinfo. Where we could drop lines without processing them at all.

This doesn't look like the From: header was in the middle of the message until it was imported into git so it is probably a small logic error that is easily corrected. But I need to see what we are parsing so I can understand what is happening.

Show 25 quoted lines
> 	commit c0bbbc73d58f1b774cd987b5687a478a027f137c
> 	Author: Christoph Lameter <clameter@sgi.com>
> 	Date:   Sun Jun 11 15:22:26 2006 -0700
> 	
> 	    [PATCH] typo in vmscan.c
> 	    
> 	    From: Christoph Lameter <clameter@sgi.com>
> 	    
> 	    Looks like a comma was left from the conversion from a struct to an
> 	    assignment.
> 	    
> 	    Signed-off-by: Christoph Lameter <clameter@sgi.com>
> 	    Signed-off-by: Andrew Morton <akpm@osdl.org>
> 	    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>
> where that "From:" in the body is totally wrong. I just didn't notice, 
> until now. Arrr!
>
> I _suspect_ that this is the work by Eric Biederman, ie part of the 
> patches that do "Allow in body headers beyond the in body header 
> prefix." and "Refactor commit messge handling."
>
> Eric? Can you please fix this up? Lines from the body of the email that 
> have been used to set authorship should _not_ also show up in the commit 
> message.
Even if the header lines are in the middle of the body?
Eric
Previous: Linus TorvaldsNext: Linus Torvalds
Message 2 of 13 in “git-applymbox broken?”
  1. Linus TorvaldsJun 11, 2006
  2. Eric W. BiedermanJun 11, 2006
  3. Linus TorvaldsJun 12, 2006
  4. Eric W. BiedermanJun 12, 2006
  5. Ignore blank lines among this inbody headers.Eric W. Biederman, Jun 12, 2006
  6. Ignore blank lines among this inbody headersEric W. Biederman, Jun 12, 2006
  7. Eric W. BiedermanJun 12, 2006
  8. Linus TorvaldsJun 12, 2006
  9. Don't parse any headers in the real body of an email message.Eric W. Biederman, Jun 12, 2006
  10. Eric W. BiedermanJun 12, 2006
  11. Johannes SchindelinJun 12, 2006
  12. Randy.DunlapJun 12, 2006
  13. Ryan AndersonJun 13, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.