[PATCH 09/27] bisect: Fixup bisect-porcelain/54
- From
- Jan Kara <jack@suse.cz>
- Date
- Nov 18, 2021, 16:49 UTC
- Message-ID
- <20211118164940.8818-10-jack@suse.cz>
- In-Reply-To
- <20211118164940.8818-1-jack@suse.cz>
Test 54 from t6030-bisect-porcelain.sh assumes that bisection algorithm suggests BROKEN_HASH8 as the second bisection point when BROKEN_HASH7 is an equivalent choice. Fix the test to work in both cases.
Signed-off-by: Jan Kara <jack@suse.cz> --- t/t6030-bisect-porcelain.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 79f253f01b00..46d67929e1e5 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -743,7 +743,11 @@ test_expect_success 'bisect: --no-checkout - target after breakage' ' git bisect start broken BROKEN_HASH4 --no-checkout && check_same BROKEN_HASH6 BISECT_HEAD && git bisect good BISECT_HEAD && - check_same BROKEN_HASH8 BISECT_HEAD && + check_oneof BISECT_HEAD BROKEN_HASH7 BROKEN_HASH8 && + if check_same BROKEN_HASH7 BISECT_HEAD; then + git bisect good BISECT_HEAD && + check_same BROKEN_HASH8 BISECT_HEAD + fi && test_must_fail git bisect good BISECT_HEAD && check_same BROKEN_HASH9 bisect/bad && git bisect reset
-- 2.26.2