From d2d188d92203997d260e8a21695b85c18b002d8f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 9 Nov 2008 15:25:55 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-bisect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.30.2