summaryrefslogtreecommitdiff
path: root/git-bisect-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-04 08:17:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-04 09:46:46 (GMT)
commit7f47e72fb3b947db4ffde56a40d999c2fe99ead2 (patch)
tree45c3e95117f6181d26c02dbc0926207f3e344d95 /git-bisect-script
parent0dd385c44a309774476b923803eafd9bb73b4804 (diff)
downloadgit-7f47e72fb3b947db4ffde56a40d999c2fe99ead2.zip
git-7f47e72fb3b947db4ffde56a40d999c2fe99ead2.tar.gz
git-7f47e72fb3b947db4ffde56a40d999c2fe99ead2.tar.bz2
git-bisect termination condition fix.
When I munged the original from Linus, which did not terminate when the last bisect to check happened to be a bad one, to terminate, I seem to have botched the end result to pick. Thanks for Sanjoy Mahajan for a good reproduction recipe to diagnose this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-bisect-script')
-rwxr-xr-xgit-bisect-script4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect-script b/git-bisect-script
index 2233b41..29b25f4 100755
--- a/git-bisect-script
+++ b/git-bisect-script
@@ -107,8 +107,8 @@ bisect_next() {
rev=$(eval "git-rev-list --bisect $good $bad") || exit
nr=$(eval "git-rev-list $rev $good" | wc -l) || exit
if [ "$nr" -le "1" ]; then
- echo "$bad is first bad commit"
- git-diff-tree --pretty $bad
+ echo "$rev is first bad commit"
+ git-diff-tree --pretty $rev
exit 0
fi
echo "Bisecting: $nr revisions left to test after this"