diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-25 19:45:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-25 19:45:07 (GMT) |
| commit | ad7ace714d353ef49045bc37c1363e8fc904792d (patch) | |
| tree | 7cefc4953bac3061de09d5380719f12c6e4fcef3 /git-bisect.sh | |
| parent | b073b7a990deb1cb3425db45642fa18c8b3cb65c (diff) | |
| parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) | |
| download | git-ad7ace714d353ef49045bc37c1363e8fc904792d.zip git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.gz git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.bz2 | |
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-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index a5ea843..6e2acb8 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -392,7 +392,7 @@ bisect_run () { cat "$GIT_DIR/BISECT_RUN" - if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ + if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \ > /dev/null; then echo >&2 "bisect run cannot continue any more" exit $res @@ -404,7 +404,7 @@ bisect_run () { exit $res fi - if grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then + if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then echo "bisect run success" exit 0; fi |