"J. Bruce Fields" <bfields@xxxxxxxxxxxx> writes: > On Sun, May 21, 2006 at 07:53:18PM -0400, J. Bruce Fields wrote: >> >From nobody Mon Sep 17 00:00:00 2001 >> From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> > > Oops, sorry, I screwed up sending those; let me know if you'd like them > resent.... That's OK. I just cooked up this one ;-). -- >8 -- >From 03946787890c12fbb6ecfbe0382cbf02ac209801 Mon Sep 17 00:00:00 2001 From: Junio C Hamano <junkio@xxxxxxx> Date: Sun, 21 May 2006 17:15:06 -0700 Subject: [PATCH] mailinfo: skip bogus UNIX From line inside body Sometimes people just include the whole format-patch output in the commit e-mail. Detect it and skip the bogus ">From " line. Signed-off-by: Junio C Hamano <junkio@xxxxxxx> --- mailinfo.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/mailinfo.c b/mailinfo.c index b276519..a133e6d 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -237,10 +237,17 @@ static int eatspace(char *line) #define SEEN_FROM 01 #define SEEN_DATE 02 #define SEEN_SUBJECT 04 +#define SEEN_BOGUS_UNIX_FROM 010 /* First lines of body can have From:, Date:, and Subject: */ static int handle_inbody_header(int *seen, char *line) { + if (!memcmp(">From", line, 5) && isspace(line[5])) { + if (!(*seen & SEEN_BOGUS_UNIX_FROM)) { + *seen |= SEEN_BOGUS_UNIX_FROM; + return 1; + } + } if (!memcmp("From:", line, 5) && isspace(line[5])) { if (!(*seen & SEEN_FROM) && handle_from(line+6)) { *seen |= SEEN_FROM; -- 1.3.3.g292f - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html