From: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Thu, 27 Jul 2006 14:03:43 +0000 (+0300)
Subject: mailinfo: accept >From in message header
X-Git-Tag: v1.4.2-rc3~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2c487cf3a6c37bc9b4e3f0e10ad08d9ce048404;p=git.git

mailinfo: accept >From in message header

Mail I get sometimes has multiple From lines, like this:

    From Majordomo@vger.kernel.org  Thu Jul 27 16:39:36 2006
    >From mtsirkin  Thu Jul 27 16:39:36 2006
    Received: from yok.mtl.com [10.0.8.11]
    ...

which confuses git-mailinfo since that does not recognize >From
as a valid header line.

This patch makes it recognize >From XXX as a valid header line.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index ac53f76f6..05dc1bfe7 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -446,7 +446,7 @@ static int read_one_header_line(char *line, int sz, FILE *in)
 			break;
 	}
 	/* Count mbox From headers as headers */
-	if (!ofs && !memcmp(line, "From ", 5))
+	if (!ofs && (!memcmp(line, "From ", 5) || !memcmp(line, ">From ", 6)))
 		ofs = 1;
 	return ofs;
 }