diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
| commit | 957f5db74fcf2a00260c8bdef4bf147b1b990914 (patch) | |
| tree | 293baa7d48d5c9428b2ffc232519f875d4cd5770 /git-am.sh | |
| parent | af742b9b27c3e3caac9b304c76db323e2334b955 (diff) | |
| parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) | |
| download | git-957f5db74fcf2a00260c8bdef4bf147b1b990914.tar.gz git-957f5db74fcf2a00260c8bdef4bf147b1b990914.tar.xz | |
Merge branch 'rs/work-around-grep-opt-insanity' into maint
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |