Re: Bug? - Unexpected lock file error

["Eric Raible" <raible@xxxxxxxxx>]

On Fri, Sep 5, 2008 at 4:47 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> "Eric Raible" <raible@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html