From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2015 20:55:05 +0000 (-0800)
Subject: Merge branch 'jc/merge-bases'
X-Git-Tag: v2.3.0-rc0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=098501527f2b5628f086d3d9d2fda87220c069a5;p=thirdparty%2Fgit.git

Merge branch 'jc/merge-bases'

The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.

* jc/merge-bases:
  get_merge_bases(): always clean-up object flags
  bisect: clean flags after checking merge bases
---

098501527f2b5628f086d3d9d2fda87220c069a5