On Thu, Sep 14, 2017 at 03:15:20PM +0200, Michael J Gruber wrote: > In fork-point mode, merge-base adds the commit at refname to a list of > candidates to walk from only when the reflog is empty. Therefore, it > fails to find merge bases that are descendants of the most recent reflog > entry. > > Add the commit at the tip unconditionally so that a merge base on the > history of refname is found in any case, independent of the state of the > reflog. OK, so the reflog we are interested in here is one where the tip commit is not mentioned. I'm not sure how one gets into that state, but I agree it makes sense to act as if it's there. -Peff
