aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-25 11:45:07 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-25 11:45:07 -0800
commitad7ace714d353ef49045bc37c1363e8fc904792d (patch)
tree7cefc4953bac3061de09d5380719f12c6e4fcef3 /git-am.sh
parentb073b7a990deb1cb3425db45642fa18c8b3cb65c (diff)
parente1622bfcbad680225ad5c337e4778df88389227e (diff)
downloadgit-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.gz
git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.xz
Merge branch 'rs/work-around-grep-opt-insanity'
* rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() Conflicts: git-instaweb.sh
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 2 insertions, 2 deletions
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