From: Johannes Schindelin <johannes.schindelin@xxxxxx>
On our journey to a fully built-in `git bisect`, this is the
last step.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
builtin/bisect--helper.c | 1 -
git-bisect.sh | 49 +---------------------------------------
2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 9f78bd45ca5..d243a9132e2 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -1455,7 +1455,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_SUBCOMMAND("terms", &fn, cmd_bisect_terms),
OPT_SUBCOMMAND("start", &fn, cmd_bisect_start),
OPT_SUBCOMMAND("next", &fn, cmd_bisect_next),
- OPT_SUBCOMMAND("state", &fn, cmd_bisect_state),
OPT_SUBCOMMAND("log", &fn, cmd_bisect_log),
OPT_SUBCOMMAND("replay", &fn, cmd_bisect_replay),
OPT_SUBCOMMAND("skip", &fn, cmd_bisect_skip),
diff --git a/git-bisect.sh b/git-bisect.sh
index f4df8709d84..028d39cd9ce 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -34,51 +34,4 @@ Please use "git help bisect" to get the full man page.'
OPTIONS_SPEC=
. git-sh-setup
-TERM_BAD=bad
-TERM_GOOD=good
-
-get_terms () {
- if test -s "$GIT_DIR/BISECT_TERMS"
- then
- {
- read TERM_BAD
- read TERM_GOOD
- } <"$GIT_DIR/BISECT_TERMS"
- fi
-}
-
-case "$#" in
-0)
- usage ;;
-*)
- cmd="$1"
- get_terms
- shift
- case "$cmd" in
- help)
- git bisect -h ;;
- start)
- git bisect--helper start "$@" ;;
- bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
- git bisect--helper "$cmd" "$@" ;;
- skip)
- git bisect--helper skip "$@" || exit;;
- next)
- # Not sure we want "next" at the UI level anymore.
- git bisect--helper next "$@" || exit ;;
- visualize|view)
- git bisect--helper visualize "$@" || exit;;
- reset)
- git bisect--helper reset "$@" ;;
- replay)
- git bisect--helper replay "$@" || exit;;
- log)
- git bisect--helper log || exit ;;
- run)
- git bisect--helper run "$@" || exit;;
- terms)
- git bisect--helper terms "$@" || exit;;
- *)
- usage ;;
- esac
-esac
+exec git bisect--helper "$@"
--
gitgitgadget
