From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 30 Jul 2005 21:32:47 GMT
Subject: Re: Fix interesting git-rev-list corner case
Message-ID: <Pine.LNX.4.58.0507301428300.29650@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.58.0507302259140.26128@telia.com>



On Sat, 30 Jul 2005, Peter Osterlund wrote:
> >
> > Can you send me your HEAD and MERGE_HEAD (don't do the merge).
> 
> HEAD      : 33ac02aa4cef417871e128ab4a6565e751e5f3b2
> MERGE_HEAD: b0825488a642cadcf39709961dde61440cb0731c

Bingo.

Yup, it's git-merge-base, and it is confused by the same thing that 
confused git-rev-list.

Thanks, I'll fix it.

		Linus