[PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[Ævar Arnfjörð Bjarmason]

Since fc304fb52f9 (Merge branch 'dd/git-bisect-builtin' into next,
2022-11-14) we've used builtin/bisect.c instead of git-bisect.sh to
implement the "bisect" command. Let's remove the unused leftover
script, and the ".gitignore" entry for the "git-bisect--helper", which
also hasn't been built since fc304fb52f9.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
This goes on top of "dd/git-bisect-builtin", which just landed in
"next".

 .gitignore    |  1 -
 git-bisect.sh | 63 ---------------------------------------------------
 2 files changed, 64 deletions(-)
 delete mode 100755 git-bisect.sh

diff --git a/.gitignore b/.gitignore
index cb0231fb401..fe234cfa19a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@
 /git-archimport
 /git-archive
 /git-bisect
-/git-bisect--helper
 /git-blame
 /git-branch
 /git-bugreport
diff --git a/git-bisect.sh b/git-bisect.sh
deleted file mode 100755
index f95b8103a9e..00000000000
--- a/git-bisect.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
-LONG_USAGE='git bisect help
-	print this long help message.
-git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
-		 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
-	reset bisect state and start bisection.
-git bisect (bad|new) [<rev>]
-	mark <rev> a known-bad revision/
-		a revision after change in a given property.
-git bisect (good|old) [<rev>...]
-	mark <rev>... known-good revisions/
-		revisions before change in a given property.
-git bisect terms [--term-good | --term-bad]
-	show the terms used for old and new commits (default: bad, good)
-git bisect skip [(<rev>|<range>)...]
-	mark <rev>... untestable revisions.
-git bisect next
-	find next bisection to test and check it out.
-git bisect reset [<commit>]
-	finish bisection search and go back to commit.
-git bisect (visualize|view)
-	show bisect status in gitk.
-git bisect replay <logfile>
-	replay bisection log.
-git bisect log
-	show bisect log.
-git bisect run <cmd>...
-	use <cmd>... to automatically bisect.
-
-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 ;;
-	*)
-		git bisect--helper "$cmd" "$@" ;;
-	esac
-esac
-- 
2.38.0.1473.g172bcc0511c

Re: [PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[Jeff King]

On Tue, Nov 15, 2022 at 10:32:42AM +0100, Ævar Arnfjörð Bjarmason wrote:

> Since fc304fb52f9 (Merge branch 'dd/git-bisect-builtin' into next,
> 2022-11-14) we've used builtin/bisect.c instead of git-bisect.sh to
> implement the "bisect" command. Let's remove the unused leftover
> script, and the ".gitignore" entry for the "git-bisect--helper", which
> also hasn't been built since fc304fb52f9.

A small nit, but it's probably not a good idea to refer to merge commits
from 'next'. They may be meaningful now, but they aren't part of the
long-term history, and will get gc'd eventually when Junio rewinds next
after a release. Which will leave this reference useless for people
looking at "git log" a year from now.

A better reference is probably 73fce29427 (Turn `git bisect` into a full
built-in, 2022-11-10), which will remain stable as it gets merged
eventually into master.

>  .gitignore    |  1 -
>  git-bisect.sh | 63 ---------------------------------------------------

The patch itself looks like an obviously correct thing to do.

-Peff

Re: [PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[Taylor Blau]

On Tue, Nov 15, 2022 at 12:07:06PM -0500, Jeff King wrote:
> On Tue, Nov 15, 2022 at 10:32:42AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> > Since fc304fb52f9 (Merge branch 'dd/git-bisect-builtin' into next,
> > 2022-11-14) we've used builtin/bisect.c instead of git-bisect.sh to
> > implement the "bisect" command. Let's remove the unused leftover
> > script, and the ".gitignore" entry for the "git-bisect--helper", which
> > also hasn't been built since fc304fb52f9.
>
> A small nit, but it's probably not a good idea to refer to merge commits
> from 'next'. They may be meaningful now, but they aren't part of the
> long-term history, and will get gc'd eventually when Junio rewinds next
> after a release. Which will leave this reference useless for people
> looking at "git log" a year from now.
>
> A better reference is probably 73fce29427 (Turn `git bisect` into a full
> built-in, 2022-11-10), which will remain stable as it gets merged
> eventually into master.

Thanks, I updated the reference to point at 73fce29427 while queueing.

As an aside, I am a little disappointed by the quality of what has
recently been hitting 'next'. There was no chance for me to find the
issues with t7610 without a Windows machine, but this should have been
caught during testing.

Thanks,
Taylor

Re: [PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[Đoàn Trần Công Danh]

On 2022-11-15 10:32:42+0100, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> Since fc304fb52f9 (Merge branch 'dd/git-bisect-builtin' into next,
> 2022-11-14) we've used builtin/bisect.c instead of git-bisect.sh to
> implement the "bisect" command. Let's remove the unused leftover
> script, and the ".gitignore" entry for the "git-bisect--helper", which
> also hasn't been built since fc304fb52f9.
> 
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> This goes on top of "dd/git-bisect-builtin", which just landed in
> "next".

Ack,
Sorry, I forgot to remove it :(
Other than the reference for commit, looking good.

-- 
Danh

Re: [PATCH] bisect; remove unused "git-bisect.sh" and ".gitignore" entry

[Taylor Blau]

On Wed, Nov 16, 2022 at 09:52:45PM +0700, Đoàn Trần Công Danh wrote:
> On 2022-11-15 10:32:42+0100, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> > Since fc304fb52f9 (Merge branch 'dd/git-bisect-builtin' into next,
> > 2022-11-14) we've used builtin/bisect.c instead of git-bisect.sh to
> > implement the "bisect" command. Let's remove the unused leftover
> > script, and the ".gitignore" entry for the "git-bisect--helper", which
> > also hasn't been built since fc304fb52f9.
> >
> > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> > ---
> > This goes on top of "dd/git-bisect-builtin", which just landed in
> > "next".
>
> Ack,
> Sorry, I forgot to remove it :(
> Other than the reference for commit, looking good.

Thanks for the ACK.

Thanks,
Taylor