[PATCH 05/27] bisect: Fixup bisect-porcelain/34
- From
- Jan Kara <jack@suse.cz>
- Date
- Nov 18, 2021, 16:49 UTC
- Message-ID
- <20211118164940.8818-6-jack@suse.cz>
- In-Reply-To
- <20211118164940.8818-1-jack@suse.cz>
Test 34 from t6030-bisect-porcelain.sh assumes that bisection algorithm suggests HASH6 after merge base when HASH5 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index d693c0002098..ed81a6403b63 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -433,7 +433,7 @@ test_expect_success 'good merge base when good and bad are siblings' ' grep $HASH4 my_bisect_log.txt && git bisect good > my_bisect_log.txt && ! grep "merge base must be tested" my_bisect_log.txt && - grep $HASH6 my_bisect_log.txt && + grep -E "$HASH5|$HASH6" my_bisect_log.txt && git bisect reset ' test_expect_success 'skipped merge base when good and bad are siblings' '
-- 2.26.2