X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-bisect-script;h=649b7026eb8b69045144da4bec6cdb4879f23c7a;hb=670f5fe34f0f6a363297d5dcd73051089b78fe82;hp=0c5c10750e34f76327df0f57ce26417b18dd8963;hpb=434d6ba03122c160f98713a009cf8a32d02982f3;p=git.git

diff --git a/git-bisect-script b/git-bisect-script
index 0c5c1075..649b7026 100755
--- a/git-bisect-script
+++ b/git-bisect-script
@@ -105,12 +105,16 @@ bisect_next() {
 	good=$(git-rev-parse --sq --revs-only --not \
 		$(cd "$GIT_DIR" && ls refs/bisect/good-*)) &&
 	rev=$(eval "git-rev-list --bisect $good $bad") || exit
-	nr=$(eval "git-rev-list $rev $good" | wc -l) || exit
-	if [ "$nr" -le "1" ]; then
+	if [ -z "$rev" ]; then
+	    echo "$bad was both good and bad"
+	    exit 1
+	fi
+	if [ "$rev" = "$bad" ]; then
 	    echo "$rev is first bad commit"
 	    git-diff-tree --pretty $rev
 	    exit 0
 	fi
+	nr=$(eval "git-rev-list $rev $good" | wc -l) || exit
 	echo "Bisecting: $nr revisions left to test after this"
 	echo "$rev" > "$GIT_DIR/refs/heads/new-bisect"
 	git checkout new-bisect || exit