diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2008-11-09 15:25:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-09 10:23:37 -0800 |
| commit | d2d188d92203997d260e8a21695b85c18b002d8f (patch) | |
| tree | e2e9b40d84944134f65423d26ac84abe72368b5b | |
| parent | bc9c0248a5cf184756ba562d6c452cace8863517 (diff) | |
| download | git-d2d188d92203997d260e8a21695b85c18b002d8f.tar.gz git-d2d188d92203997d260e8a21695b85c18b002d8f.tar.xz | |
bisect: fix missing "exit"
Check to see given bad/good/skip sets are valid commit and to exit
otherwise was broken by 6a54d97 (bisect: remove "checkout_done" variable
used when checking merge bases, 2008-09-06).
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-bisect.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 79de7017e..0d0e278c9 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -455,7 +455,7 @@ bisect_next() { good=$(git for-each-ref --format='^%(objectname)' \ "refs/bisect/good-*" | tr '\012' ' ') && skip=$(git for-each-ref --format='%(objectname)' \ - "refs/bisect/skip-*" | tr '\012' ' ') && + "refs/bisect/skip-*" | tr '\012' ' ') || exit # Maybe some merge bases must be tested first check_good_are_ancestors_of_bad "$bad" "$good" "$skip" |