Re: [PATCH] move get_merge_bases() to core lib; use it in merge-recursive

From: Alex Riesen <fork0@t-online.de>
Date: Jun 30, 2006, 00:27 UTC
Message-ID: <20060630002713.GD7216@steel.home>
In-Reply-To: <Pine.LNX.4.63.0606292050380.29667@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin, Thu, Jun 29, 2006 21:06:56 +0200:

Show 11 quoted lines

> 
> Okay. Convinced.
> 
> I tested my patch again, and like Alex said, a test fails. But I tested on 
> top of Alex's latest merge-recursive patch, which has that nasty 
> update-index bug, and that is the reason for the test to fail.
> 
> So, a few tests later, I am pretty sure that my patches do not break 
> git-merge-base. I'll prepare another patch series which builds-in 
> merge-base.
>

Just for reference, I'll repost all my patches again, somewhat consolidated. Your merge_base patches can be applied on top of that series.