Test 32 from t6030-bisect-porcelain.sh assumes that bisection algorithm suggests HASH6 after HASH4 when HASH5 is an equivalent choice. Fix the test to work in both cases. Signed-off-by: Jan Kara <jack@xxxxxxx> --- t/t6030-bisect-porcelain.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 13f7deea4d81..d693c0002098 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -395,9 +395,13 @@ test_expect_success 'bisect does not create a "bisect" branch' ' test "$rev_hash4" = "$HASH4" && git branch -D bisect && git bisect good && + rev_hash=$(git rev-parse --verify HEAD) && + if [ $rev_hash == "$HASH5" ]; then + git bisect good && + rev_hash=$(git rev-parse --verify HEAD) + fi && git branch bisect && - rev_hash6=$(git rev-parse --verify HEAD) && - test "$rev_hash6" = "$HASH6" && + test "$rev_hash" = "$HASH6" && git bisect good > my_bisect_log.txt && grep "$HASH7 is the first bad commit" my_bisect_log.txt && git bisect reset && -- 2.26.2
