From: Johannes Schindelin Date: Thu, 29 Jun 2006 19:06:56 GMT Subject: Re: [PATCH] move get_merge_bases() to core lib; use it in merge-recursive Message-ID: In-Reply-To: <7vmzbvrela.fsf@assigned-by-dhcp.cox.net> Hi Linus, Hi Junio [this is a response to both of your responses; mail threads cannot yet be merged a la git ;-)] On Thu, 29 Jun 2006, Junio C Hamano wrote: > Johannes Schindelin writes: > > > My point being: it makes no sense to split off get_merge_bases() if nobody > > uses it except for git-merge-base. > > I do not think that is a good reasoning. If something is > reusable (or you made it reusable) and you are planning to reuse > it later, splitting it out without changing anything else to > make sure the split is correct is a seemingly small but a very > important step. 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. Ciao, Dscho