From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Dec 2008 01:27:55 GMT
Subject: Re: Possibly-spurious 'not uptodate. Cannot merge'
Message-ID: <7vy6yiz0pw.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <gi4adq$cr1$1@ger.gmane.org>

Sitaram Chamarty <sitaramc@gmail.com> writes:

> On 2008-12-14, Nix <nix@esperi.org.uk> wrote:
>> In this situation, 'git diff' reports no changes at all, but 'git reset
>> --hard' gets the tree back into a state where merging succeeds, as does
>> 'git update-index --refresh'.
>
> Wasn't there some situation in which merely running 'git
> status' would have a similar effect?  I seem to recall
> reading that somewhere but now I can't find any mention of
> it in 'git help status'.

It would, but this is a pure bug in the re-implementation of git-merge
that was introduced soon after v1.5.6.  The users shouldn't be required to
run refresh to work this around.