Test 58 from t6030-bisect-porcelain.sh assumes that bisection algorithm suggests HASH6 as the last bisection step 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 46d67929e1e5..3363dc765b9d 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -811,7 +811,8 @@ test_expect_success '"git bisect bad HEAD" behaves as "git bisect bad"' ' git bisect start HEAD $HASH1 && git bisect good HEAD && git bisect bad HEAD && - test "$HASH6" = $(git rev-parse --verify HEAD) && + rev=$(git rev-parse --verify HEAD) && + test "$HASH5" = "$rev" -o "$HASH6" = "$rev" && git bisect reset ' -- 2.26.2
