commit-graph: avoid leaking topo_levels slab in write_commit_graph()

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

diff --git a/git-bisect.sh b/git-bisect.sh
index 1f3f6e9fc5684d3e9dd2a0ac0260556955c9fa4b..6a7afaea8da09fa3fb3670d1a688421fbf152747 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -39,21 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 TERM_BAD=bad
 TERM_GOOD=good
 
-bisect_skip() {
-       all=''
-       for arg in "$@"
-       do
-               case "$arg" in
-               *..*)
-                       revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
-               *)
-                       revs=$(git rev-parse --sq-quote "$arg") ;;
-               esac
-               all="$all $revs"
-       done
-       eval git bisect--helper --bisect-state 'skip' $all
-}
-
 bisect_visualize() {
        git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
 
@@ -77,38 +62,6 @@ bisect_visualize() {
        eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
 }
 
-bisect_replay () {
-       file="$1"
-       test "$#" -eq 1 || die "$(gettext "No logfile given")"
-       test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
-       git bisect--helper --bisect-reset || exit
-       oIFS="$IFS" IFS="$IFS$(printf '\015')"
-       while read git bisect command rev tail
-       do
-               test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
-               if test "$git" = "git-bisect"
-               then
-                       rev="$command"
-                       command="$bisect"
-               fi
-               get_terms
-               git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit
-               get_terms
-               case "$command" in
-               start)
-                       eval "git bisect--helper --bisect-start $rev $tail" ;;
-               "$TERM_GOOD"|"$TERM_BAD"|skip)
-                       git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
-               terms)
-                       git bisect--helper --bisect-terms $rev || exit;;
-               *)
-                       die "$(gettext "?? what are you talking about?")" ;;
-               esac
-       done <"$file"
-       IFS="$oIFS"
-       git bisect--helper --bisect-auto-next || exit
-}
-
 bisect_run () {
        git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
 
@@ -169,11 +122,6 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
        done
 }
 
-bisect_log () {
-       test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
-       cat "$GIT_DIR/BISECT_LOG"
-}
-
 get_terms () {
        if test -s "$GIT_DIR/BISECT_TERMS"
        then
@@ -199,7 +147,7 @@ case "$#" in
        bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
                git bisect--helper --bisect-state "$cmd" "$@" ;;
        skip)
-               bisect_skip "$@" ;;
+               git bisect--helper --bisect-skip "$@" || exit;;
        next)
                # Not sure we want "next" at the UI level anymore.
                git bisect--helper --bisect-next "$@" || exit ;;
@@ -208,9 +156,9 @@ case "$#" in
        reset)
                git bisect--helper --bisect-reset "$@" ;;
        replay)
-               bisect_replay "$@" ;;
+               git bisect--helper --bisect-replay "$@" || exit;;
        log)
-               bisect_log ;;
+               git bisect--helper --bisect-log || exit ;;
        run)
                bisect_run "$@" ;;
        terms)