From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Oct 2014 19:01:11 +0000 (-0700)
Subject: bisect: clean flags after checking merge bases
X-Git-Tag: v2.3.0-rc0~27^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d76c9e95b435b660f8f1b3e01d3c2f934e2ec441;p=thirdparty%2Fgit.git

bisect: clean flags after checking merge bases

Unless there is a good reason to belieave that a particular
invocation of a get_merge_bases*() is the last one that cares about
the object flags the computation of merge bases leaves on the
objects, the "cleanup" parameter should always be true, and I do not
think there is one in this codepath.

Found by code inspection.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/bisect.c b/bisect.c
index d6e851d783..604c577caa 100644
--- a/bisect.c
+++ b/bisect.c
@@ -776,7 +776,7 @@ static void check_merge_bases(int no_checkout)
 	int rev_nr;
 	struct commit **rev = get_bad_and_good_commits(&rev_nr);
 
-	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
+	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 1);
 
 	for (; result; result = result->next) {
 		const unsigned char *mb = result->item->object.sha1;