From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Apr 2012 17:50:55 GMT
Subject: Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)
Message-ID: <CA+55aFyZYnAxJc8YT=GEnq-fdXbHCXyx937KNBngn69Zuxmcgg@mail.gmail.com>
In-Reply-To: <7vehrnwpoi.fsf@alter.siamese.dyndns.org>

On Mon, Apr 16, 2012 at 10:29 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> I wonder if use of remoteheads later in the same function are correct,
> though.  We equate "!remoteheads->next" and "We are not doing octopus",
> for example.

I do think it would generally be a great idea to never use
"remoteheads" at all. An octopus merge that has been simplified to
just two parents isn't really an octopus merge any more.

So I think you're probably right - we should try to avoid using
remoteheads entirely, and any use is suspect

                 Linus