Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-am: force egrep to use correct characters set
author
Christian Himpel
<chressie@googlemail.com>
Fri, 25 Sep 2009 16:43:20 +0000
(18:43 +0200)
committer
Shawn O. Pearce
<spearce@spearce.org>
Fri, 25 Sep 2009 22:35:05 +0000
(15:35 -0700)
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>
git-am.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6900d75
)
diff --git
a/git-am.sh
b/git-am.sh
index 0ddd80fef9f177b52bff726e33849f06613efce0..c132f50da5f3416e6177dd7010e6db3660bdb073 100755
(executable)
--- 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