Merge branch 'dl/reset-doc-no-wrt-abbrev'

[thirdparty/git.git] / git-bisect.sh

diff --git a/git-bisect.sh b/git-bisect.sh
index bdb614e3c2de835a329a4d2a9866de35a77ac3de..efee12b8b1e6d53d3cd5275683ebb0a4198b4b95 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -71,122 +71,7 @@ bisect_autostart() {
 }
 
 bisect_start() {
-       #
-       # Check for one bad and then some good revisions.
-       #
-       has_double_dash=0
-       for arg; do
-               case "$arg" in --) has_double_dash=1; break ;; esac
-       done
-       orig_args=$(git rev-parse --sq-quote "$@")
-       bad_seen=0
-       eval=''
-       must_write_terms=0
-       revs=''
-       if test "z$(git rev-parse --is-bare-repository)" != zfalse
-       then
-               mode=--no-checkout
-       else
-               mode=''
-       fi
-       while [ $# -gt 0 ]; do
-               arg="$1"
-               case "$arg" in
-               --)
-                       shift
-                       break
-               ;;
-               --no-checkout)
-                       mode=--no-checkout
-                       shift ;;
-               --term-good|--term-old)
-                       shift
-                       must_write_terms=1
-                       TERM_GOOD=$1
-                       shift ;;
-               --term-good=*|--term-old=*)
-                       must_write_terms=1
-                       TERM_GOOD=${1#*=}
-                       shift ;;
-               --term-bad|--term-new)
-                       shift
-                       must_write_terms=1
-                       TERM_BAD=$1
-                       shift ;;
-               --term-bad=*|--term-new=*)
-                       must_write_terms=1
-                       TERM_BAD=${1#*=}
-                       shift ;;
-               --*)
-                       die "$(eval_gettext "unrecognised option: '\$arg'")" ;;
-               *)
-                       rev=$(git rev-parse -q --verify "$arg^{commit}") || {
-                               test $has_double_dash -eq 1 &&
-                               die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
-                               break
-                       }
-                       revs="$revs $rev"
-                       shift
-                       ;;
-               esac
-       done
-
-       for rev in $revs
-       do
-               # The user ran "git bisect start <sha1>
-               # <sha1>", hence did not explicitly specify
-               # the terms, but we are already starting to
-               # set references named with the default terms,
-               # and won't be able to change afterwards.
-               must_write_terms=1
-
-               case $bad_seen in
-               0) state=$TERM_BAD ; bad_seen=1 ;;
-               *) state=$TERM_GOOD ;;
-               esac
-               eval="$eval git bisect--helper --bisect-write '$state' '$rev' '$TERM_GOOD' '$TERM_BAD' 'nolog' &&"
-       done
-       #
-       # Verify HEAD.
-       #
-       head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) ||
-       head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) ||
-       die "$(gettext "Bad HEAD - I need a HEAD")"
-
-       #
-       # Check if we are bisecting.
-       #
-       start_head=''
-       if test -s "$GIT_DIR/BISECT_START"
-       then
-               # Reset to the rev from where we started.
-               start_head=$(cat "$GIT_DIR/BISECT_START")
-               if test "z$mode" != "z--no-checkout"
-               then
-                       git checkout "$start_head" -- ||
-                       die "$(eval_gettext "Checking out '\$start_head' failed. Try 'git bisect reset <valid-branch>'.")"
-               fi
-       else
-               # Get rev from where we start.
-               case "$head" in
-               refs/heads/*|$_x40)
-                       # This error message should only be triggered by
-                       # cogito usage, and cogito users should understand
-                       # it relates to cg-seek.
-                       [ -s "$GIT_DIR/head-name" ] &&
-                               die "$(gettext "won't bisect on cg-seek'ed tree")"
-                       start_head="${head#refs/heads/}"
-                       ;;
-               *)
-                       die "$(gettext "Bad HEAD - strange symbolic ref")"
-                       ;;
-               esac
-       fi
-
-       #
-       # Get rid of any old bisect state.
-       #
-       git bisect--helper --bisect-clean-state || exit
+       git bisect--helper --bisect-start $@ || exit
 
        #
        # Change state.
@@ -198,23 +83,10 @@ bisect_start() {
        trap 'git bisect--helper --bisect-clean-state' 0
        trap 'exit 255' 1 2 3 15
 
-       #
-       # Write new start state.
-       #
-       echo "$start_head" >"$GIT_DIR/BISECT_START" && {
-               test "z$mode" != "z--no-checkout" ||
-               git update-ref --no-deref BISECT_HEAD "$start_head"
-       } &&
-       git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
-       eval "$eval true" &&
-       if test $must_write_terms -eq 1
-       then
-               git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit
-       fi &&
-       echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
        #
        # Check if we can proceed to the next bisect state.
        #
+       get_terms
        bisect_auto_next
 
        trap '-' 0