mailinfo: 'From:' header should be unfold as well

navytux · gitster · commit ddfb3696b91e · 2009-01-12T15:22:11.000-08:00
At present we do headers unfolding (see RFC822 3.1.1. LONG HEADER FIELDS) for
all fields except 'From' (always) and 'Subject' (when keep_subject is set)

Not unfolding 'From' is a bug -- see above-mentioned RFC link.

Signed-off-by: Kirill Smelkov &lt;kirr@landau.phys.spbu.ru&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
@@ -871,6 +871,7 @@ static void handle_info(void)
 			}
 			output_header_lines(fout, "Subject", hdr);
 		} else if (!memcmp(header[i], "From", 4)) {
+			cleanup_space(hdr);
 			handle_from(hdr);
 			fprintf(fout, "Author: %s\n", name.buf);
 			fprintf(fout, "Email: %s\n", email.buf);
diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
@@ -2,7 +2,10 @@
 	
     
 From nobody Mon Sep 17 00:00:00 2001
-From: A U Thor <a.u.thor@example.com>
+From: A
+      U
+      Thor
+      <a.u.thor@example.com>
 Date: Fri, 9 Jun 2006 00:44:16 -0700
 Subject: [PATCH] a commit.
 

Original file line number	Diff line number	Diff line change
`@@ -871,6 +871,7 @@ static void handle_info(void)`
`871`	`871`	`}`
`872`	`872`	`output_header_lines(fout, "Subject", hdr);`
`873`	`873`	`} else if (!memcmp(header[i], "From", 4)) {`
	`874`	`+ cleanup_space(hdr);`
`874`	`875`	`handle_from(hdr);`
`875`	`876`	`fprintf(fout, "Author: %s\n", name.buf);`
`876`	`877`	`fprintf(fout, "Email: %s\n", email.buf);`
-Original file line number
+Diff line change
 From nobody Mon Sep 17 00:00:00 2001
 -From: A U Thor <[email protected]>
 +From: A
 +      U
 +      Thor
 +      <[email protected]>
 Date: Fri, 9 Jun 2006 00:44:16 -0700
 Subject: [PATCH] a commit.