[PATCH 03/27] bisect: Fixup test bisect-porcelain/20
- From
- Jan Kara <jack@suse.cz>
- Date
- Nov 18, 2021, 16:49 UTC
- Message-ID
- <20211118164940.8818-4-jack@suse.cz>
- In-Reply-To
- <20211118164940.8818-1-jack@suse.cz>
Test 20 from t6030-bisect-porcelain.sh fails if the bisection algorithm picks HASH2 instead of HASH3 as the first step although these are equivalent. Fix the test to work in both cases.
Signed-off-by: Jan Kara <jack@suse.cz> --- t/t6030-bisect-porcelain.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index f8cfdd3c36d2..13f7deea4d81 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -240,8 +240,13 @@ test_expect_success 'bisect skip: cannot tell between 3 commits' ' test_expect_success 'bisect skip: cannot tell between 2 commits' ' test_when_finished git bisect reset && git bisect start $HASH4 $HASH1 && - git bisect skip && - test_expect_code 2 git bisect good >my_bisect_log.txt && + if [ $(git rev-parse HEAD) == $HASH2 ]; then + results=('good' 'skip') + else + results=('skip' 'good') + fi && + git bisect ${results[0]} && + test_expect_code 2 git bisect ${results[1]} >my_bisect_log.txt && grep "first bad commit could be any of" my_bisect_log.txt && ! grep $HASH1 my_bisect_log.txt && ! grep $HASH2 my_bisect_log.txt &&
-- 2.26.2