From: Eric Raible <raible@gmail.com>
Date: Sat, 06 Sep 2008 00:05:36 GMT
Subject: Re: Bug? - Unexpected lock file error
Message-ID: <279b37b20809051705o1f00ac4fpfc085fe58fdf5133@mail.gmail.com>
In-Reply-To: <7v63paupd8.fsf@gitster.siamese.dyndns.org>

On Fri, Sep 5, 2008 at 4:47 PM, Junio C Hamano <gitster@pobox.com> wrote:
> "Eric Raible" <raible@gmail.com> writes:
>
>> If 'empty' has any commits then the merge happens as expected.
>
> I think it is a bug in the git-merge rewritten in C, in "Already
> uptodate!" codepath.

And the ""Already uptodate!" codepath isn't even triggered when we're up-to-date
but 'empty' has at even one actual commit.  In that case we get a friendly
"Already up-to-date" and no fatal error.