diff mbox series

[05/27] bisect: Fixup bisect-porcelain/34

Message ID	20211118164940.8818-6-jack@suse.cz (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Jan Kara <jack@suse.cz> To: git@vger.kernel.org Cc: Jan Kara <jack@suse.cz> Subject: [PATCH 05/27] bisect: Fixup bisect-porcelain/34 Date: Thu, 18 Nov 2021 17:49:18 +0100 Message-Id: <20211118164940.8818-6-jack@suse.cz> In-Reply-To: <20211118164940.8818-1-jack@suse.cz> References: <20211118164940.8818-1-jack@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/27] bisect: Fixup test rev-list-bisect/02 \| expand [01/27] bisect: Fixup test rev-list-bisect/02 [02/27] bisect: Fixup bisect-porcelain/17 [03/27] bisect: Fixup test bisect-porcelain/20 [04/27] bisect: Fixup bisect-porcelain/32 [05/27] bisect: Fixup bisect-porcelain/34 [06/27] bisect: Fixup bisect-porcelain/40 [07/27] bisect: Remove duplicated bisect-porcelain/48 [08/27] bisect: Fixup bisect-porcelain/50 [09/27] bisect: Fixup bisect-porcelain/54 [10/27] bisect: Fixup bisect-porcelain/58 [11/27] bisect: Fix bisection debugging [12/27] bisect: Accept and store confidence with each decision [13/27] bisect: Allow specifying desired result confidence [14/27] bisect: Use void * for commit_weight [15/27] bisect: Rename clear_distance() to clear_counted_flag() [16/27] bisect: Separate commit list reversal [17/27] bisect: Allow more complex commit weights [18/27] bisect: Terminate early if there are no eligible commits [19/27] bisect: Compute reachability of tested revs [20/27] bisect: Compute probability a particular commit is bad [21/27] bisect: Reorganize commit weight computation [22/27] bisect: Move count_distance() [23/27] bisect: Find bisection point for stochastic weights [24/27] bisect: Stop bisection when we are confident about bad commit [25/27] bisect: Report commit with the highest probability [26/27] bisect: Debug stochastic bisection [27/27] bisect: Allow bisection debugging of approx_halfway()

Commit Message

Jan Kara Nov. 18, 2021, 4:49 p.m. UTC

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 mbox series

Patch

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' '