From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 06 Sep 2008 00:09:32 GMT
Subject: Re: Bug? - Unexpected lock file error
Message-ID: <7vtzcut9s3.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <7v63paupd8.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> "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.

Try reverting 18668f5 (builtin-merge: avoid run_command_v_opt() for
recursive and subtree, 2008-08-28).  That patch seems to be seriously
broken.