From: Russell King Date: Fri, 29 Apr 2005 20:52:50 GMT Subject: Re: Odd decision of git-pasky-0.7 to do a merge Message-ID: <20050429215250.E30010@flint.arm.linux.org.uk> In-Reply-To: On Fri, Apr 29, 2005 at 10:44:29AM -0700, Linus Torvalds wrote: > On Fri, 29 Apr 2005, Russell King wrote: > > Why it decided that a merge was necessary is beyond me. Any ideas? > > Did Linus forget to merge his tree properly? > > It looks like it was unable to find the right common ancestor. > > If you only had my stuff in it, the common ancestor _should_ have been the > parent (c60c390620e0abb60d4ae8c43583714bda27763f), which _should_ have > been your old top. > > But maybe merge-base didn't work right? Yup - pasky-0.7 came out with some weird commit-id, but cogito-0.8 got it right. Now using cogito-0.8 here, so I'm no longer concerned about this particular problem. -- Russell King