diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-04 01:17:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-04 02:46:46 -0700 |
| commit | 7f47e72fb3b947db4ffde56a40d999c2fe99ead2 (patch) | |
| tree | 45c3e95117f6181d26c02dbc0926207f3e344d95 | |
| parent | 0dd385c44a309774476b923803eafd9bb73b4804 (diff) | |
| download | git-7f47e72fb3b947db4ffde56a40d999c2fe99ead2.tar.gz git-7f47e72fb3b947db4ffde56a40d999c2fe99ead2.tar.xz | |
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>
| -rwxr-xr-x | git-bisect-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect-script b/git-bisect-script index 2233b4143..29b25f4a4 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" |