From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Oct 2009 23:25:40 +0000 (-0700)
Subject: Merge branch 'ch/am-header'
X-Git-Tag: v1.6.5~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/170a4814d382e79ea774813c99f12bb2a2922776?hp=e1c1a0674b5848eb3207a29d5513c9112c72d10c

Merge branch 'ch/am-header'

* ch/am-header:
git-am: force egrep to use correct characters set
git-am: fixed patch_format detection according to RFC2822
---

diff --git a/git-am.sh b/git-am.sh
index 26ffe702e0..c132f50da5 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 ||
+			LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
 			patch_format=mbox
 		fi
 	} < "$1" || clean_abort