From: Christian Himpel <chressie@googlemail.com>
Date: Fri, 25 Sep 2009 15:14:31 +0000 (+0200)
Subject: git-am: fixed patch_format detection according to RFC2822
X-Git-Tag: v1.6.5~7^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6900d750f4894e7bee714874c04cc14312cd91ec;p=git.git

git-am: fixed patch_format detection according to RFC2822

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>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-am.sh b/git-am.sh
index 26ffe702e..0ddd80fef 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