summaryrefslogtreecommitdiff
path: root/git-bisect-script
diff options
context:
space:
mode:
Diffstat (limited to 'git-bisect-script')
-rwxr-xr-xgit-bisect-script8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-bisect-script b/git-bisect-script
index 0c5c107..649b702 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