From: Eric W. Biederman Date: Sun, 11 Jun 2006 23:33:59 GMT Subject: Re: git-applymbox broken? Message-ID: In-Reply-To: Linus Torvalds writes: > 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. > commit c0bbbc73d58f1b774cd987b5687a478a027f137c > Author: Christoph Lameter > Date: Sun Jun 11 15:22:26 2006 -0700 > > [PATCH] typo in vmscan.c > > From: Christoph Lameter > > Looks like a comma was left from the conversion from a struct to an > assignment. > > Signed-off-by: Christoph Lameter > Signed-off-by: Andrew Morton > Signed-off-by: Linus Torvalds > > 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