bisect: clean flags after checking merge bases
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Oct 2014 19:01:11 +0000 (12:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Oct 2014 19:51:10 +0000 (12:51 -0700)
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>
bisect.c
index d6e851d783c3541eb21edd47170ce7a32e082e61..604c577caace56222ba19ff26495efc41f53ccdd 100644 (file)
--- 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;