X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=512891d217fc34ed5ff9992ed0b3dc7ff23f0bb0;hb=525ecd26c6cc8d1dc0c6190d8266e5d30b06da51;hp=151512afd383ed86b5a8310c53e7910db5b87e90;hpb=038188637e105e2e0d35bf844797dcadd693eb3e;p=git.git diff --git a/git-am.sh b/git-am.sh index 151512afd..512891d21 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" | - LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null || + sane_egrep -v '^[!-9;-~]+:' >/dev/null || patch_format=mbox fi } < "$1" || clean_abort @@ -561,7 +561,7 @@ do stop_here $this # skip pine's internal folder data - grep '^Author: Mail System Internal Data$' \ + sane_grep '^Author: Mail System Internal Data$' \ <"$dotest"/info >/dev/null && go_next && continue