summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Himpel <chressie@googlemail.com>2009-09-25 16:43:20 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2009-09-25 22:35:05 (GMT)
commitfa9d3485ead15387fd76a35284bd3ffb32d7c6c7 (patch)
tree5fe98d6b505c2ec58911223ef7bcfe2863cdfc7f
parent6900d750f4894e7bee714874c04cc14312cd91ec (diff)
downloadgit-fa9d3485ead15387fd76a35284bd3ffb32d7c6c7.zip
git-fa9d3485ead15387fd76a35284bd3ffb32d7c6c7.tar.gz
git-fa9d3485ead15387fd76a35284bd3ffb32d7c6c7.tar.bz2
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>
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 0ddd80f..c132f50 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