[PATCH 1/2] git-am: fixed patch_format detection according to RFC2822

From: Christian Himpel <chressie@googlemail.com>
Date: Sep 25, 2009, 15:14 UTC
Message-ID: <d7d039c304614d8d39fd2e7ad8d036a77121cc4f.1253891124.git.chressie@gmail.com>

RFC2822 specifies in paragraph 3.6.8, that optional header fields are made up of any printable US-ASCII character except ' ' (space) and ':' (colon).

The pattern for the egrep command is changed to match all of these characters.

Signed-off-by: Christian Himpel <chressie@gmail.com>
---

Hi,

I had a problem with applying a patch with 'git am', because the one header fields in the patch-e-mail contained numbers. So I read the RFC2822 what they say about header fields. Unbelievable but any printable character except space and colon are allowed in header fields. So I changed the egrep expression according to this rule.

Regards, chressie

 git-am.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 26ffe70..0ddd80f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -205,7 +205,7 @@ check_patch_format () {
 			# and see if it looks like that they all begin with the
 			# header field names...
 			sed -n -e '/^$/q' -e '/^[ 	]/d' -e p "$1" |
-			egrep -v '^[A-Za-z]+(-[A-Za-z]+)*:' >/dev/null ||
+			egrep -v '^[!-9;-~]+:' >/dev/null ||
 			patch_format=mbox
 		fi
 	} < "$1" || clean_abort

-- 
1.6.4.4