Re: [PATCH] add receive.denyNonFastforwards config variable

From: Jeff King <peff@peff.net>
Date: Sep 21, 2006, 05:52 UTC
Message-ID: <20060921055252.GA29479@coredump.intra.peff.net>
In-Reply-To: <Pine.LNX.4.63.0609210211570.19042@wbgn013.biozentrum.uni-wuerzburg.de>

On Thu, Sep 21, 2006 at 02:17:22AM +0200, Johannes Schindelin wrote:

Show 10 quoted lines

> So we indeed assumed that git-merge-base returns the old commit in the 
> case of a fast-forward (git-merge-base returns just the first item of the 
> result of get_merge_bases()).
> 
> Note that I have no proof that this assumption is true. It might be wrong 
> in this case:
> 
>     X - a - b - c - Y
>   /           /
> o - d - e - f

In your example, git-merge-base X Y returns X. In fact, I could only get one merge base out of git-merge-base --all. I tried looking in the tests to find a case that produced multiple merge bases, but I was unable to find one. Is there an example floating around somewhere?

-Peff