Skip to content

Commit 170a481

Browse files
committed
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
2 parents e1c1a06 + fa9d348 commit 170a481

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-am.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ check_patch_format () {
205205
# and see if it looks like that they all begin with the
206206
# header field names...
207207
sed -n -e '/^$/q' -e '/^[ ]/d' -e p "$1" |
208-
egrep -v '^[A-Za-z]+(-[A-Za-z]+)*:' >/dev/null ||
208+
LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
209209
patch_format=mbox
210210
fi
211211
} < "$1" || clean_abort

0 commit comments

Comments
 (0)