From: Christian Himpel <chressie@googlemail.com>
Date: Fri, 25 Sep 2009 16:43:20 +0000 (+0200)
Subject: git-am: force egrep to use correct characters set
X-Git-Tag: v1.6.5~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fa9d3485ead15387fd76a35284bd3ffb32d7c6c7;p=git.git

git-am: force egrep to use correct characters set

According to egrep(1) the US-ASCII table is used when LC_ALL=C is set.
We do not rely here on the LC_ALL value we get from the environment.

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 0ddd80fef..c132f50da 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 '^[!-9;-~]+:' >/dev/null ||
+			LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
 			patch_format=mbox
 		fi
 	} < "$1" || clean_abort