summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-09 16:25:40 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-09 16:25:40 -0700
commit170a4814d382e79ea774813c99f12bb2a2922776 (patch)
treec49bc48c598fe39474114388f33cccecd12be393
parente1c1a0674b5848eb3207a29d5513c9112c72d10c (diff)
parentfa9d3485ead15387fd76a35284bd3ffb32d7c6c7 (diff)
downloadgit-170a4814d382e79ea774813c99f12bb2a2922776.tar.gz
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
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
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