git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "McHenry, Matt" <mmchenry@carnegielearning.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: recovering from "unordered stage entries in index" error
Date: Fri, 22 May 2015 07:17:50 +0700	[thread overview]
Message-ID: <CACsJy8Bdx5tto0w1q7rZ1ORx8RmHZCEKPyBqYs37k=YvbO3kzA@mail.gmail.com> (raw)
In-Reply-To: <xmqqwq01kh8r.fsf@gitster.dls.corp.google.com>

On Thu, May 21, 2015 at 11:49 PM, Junio C Hamano <gitster@pobox.com> wrote:
> 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.

Ahh that would explain why ls-files works. Yep.
-- 
Duy

  reply	other threads:[~2015-05-22  0:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-19 13:48 recovering from "unordered stage entries in index" error McHenry, Matt
2015-05-19 15:19 ` Junio C Hamano
2015-05-19 16:51   ` McHenry, Matt
2015-05-21  9:56 ` Duy Nguyen
2015-05-21 13:19   ` McHenry, Matt
2015-05-21 16:49   ` Junio C Hamano
2015-05-22  0:17     ` Duy Nguyen [this message]
2015-05-22 18:56       ` McHenry, Matt
2015-05-23  2:06         ` Duy Nguyen
2015-05-23  2:47           ` McHenry, Matt
2015-05-24  9:52             ` Duy Nguyen
2015-05-26 13:28               ` McHenry, Matt
2015-05-26 13:37                 ` Duy Nguyen
     [not found]           ` <805ACAFCB18CC2408F45D98ABEC64B650A06EC538B@exchdb01>
2015-05-23 21:36             ` McHenry, Matt
2015-05-22 19:24 ` Junio C Hamano
2015-05-22 19:57   ` McHenry, Matt
2015-05-23 17:06     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CACsJy8Bdx5tto0w1q7rZ1ORx8RmHZCEKPyBqYs37k=YvbO3kzA@mail.gmail.com' \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mmchenry@carnegielearning.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).