From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 May 2015 16:49:56 GMT
Subject: Re: recovering from "unordered stage entries in index" error
Message-ID: <xmqqwq01kh8r.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CACsJy8AS-9Cv6V=OKTckpnqd6OGsmvRy17TLoikT4QkA0sRofg@mail.gmail.com>

Duy Nguyen <pclouds@gmail.com> writes:

> This message can be improved to show what entries have this problem.
> But then I don't see any way to recover the index manually. ls-files
> will die too.

Isn't this failure coming from git-svn that tries to write out a
tree after it prepared whatever it wants to record in its (possibly
temporary) index?  I have a feeling that the index held by the end
user is not broken.