From: Peter Osterlund Date: Sat, 30 Jul 2005 23:11:19 GMT Subject: Re: Fix interesting git-rev-list corner case Message-ID: In-Reply-To: Linus Torvalds writes: > On Sat, 30 Jul 2005, Linus Torvalds wrote: > > > > Yup, it's git-merge-base, and it is confused by the same thing that > > confused git-rev-list. > > > > Thanks, I'll fix it. > > Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe > somebody else can come up with a better one. I think this one ends up > being quite a bit more expensive than the old one (it will look up _all_ > common parents that have a child that isn't common, and then select the > newest one of the bunch), but I haven't really thought it through very > much. > > I bet there is a smarter way to do this, but this _should_ fix the problem > Peter sees. Peter? Yes, it does fix the problem. Thanks. -- Peter Osterlund - petero2@telia.com http://web.telia.com/~u89404340