summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-30 19:01:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-30 19:51:10 (GMT)
commitd76c9e95b435b660f8f1b3e01d3c2f934e2ec441 (patch)
tree2364c1d1bea4f6fac4c56f50b16e13dcdc70dd0e
parent76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff)
downloadgit-d76c9e95b435b660f8f1b3e01d3c2f934e2ec441.zip
git-d76c9e95b435b660f8f1b3e01d3c2f934e2ec441.tar.gz
git-d76c9e95b435b660f8f1b3e01d3c2f934e2ec441.tar.bz2
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>
-rw-r--r--bisect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bisect.c b/bisect.c
index d6e851d..604c577 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;