git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: recovering from "unordered stage entries in index" error

From
Junio C Hamano <gitster@pobox.com>
Date
May 22, 2015, 19:24 UTC
Message-ID
<CAPc5daVFA-FKTSUCRmb=JUr=H9ECtK8nJB3nyxHprCcJ+0CHBQ@mail.gmail.com>
In-Reply-To
<D377A9280DB18546A2471214D5CBB0E908599428C7@exchdb01>

The message "unordered stage entries in index" comes only when two adjacent entries in the index are in a wrong order, e.g. "test0" should come before "test1" but somehow the index records them in the other way around. Doing something like this:

$ git ls-files >Q $ LANG=C LC_ALL=C sort Q >R $ diff Q R

may tell you which entries are wrong, even though it wouldn't show who made them wrong.

(pardon top-posting, overlong lines and typos; sent from GMail web UI)

On Tue, May 19, 2015 at 6:48 AM, McHenry, Matt <mmchenry@carnegielearning.com> wrote:

Show 22 quoted lines
>
>         I've just upgraded my git from 2.0.5 to 2.3.6, and I'm now unable to run 'git svn fetch' in one of my repositories:
>
> $ git svn fetch
> fatal: unordered stage entries in index
> write-tree: command returned error: 128
>
>         'git status' shows a few untracked files but is otherwise clean.
>
>         It looks like this check was introduced in 15999d0be8179fb7a2e6eafb931d25ed65df50aa, with the summary "read_index_from(): catch out of order entries when reading an index file" (first appearing in 2.2.0).
>
>         Mailing list discussion looked like it implicated third-party tools.  I don't recall running any other tools on this repo; it doesn't do much day-to-day other than a long series of 'git svn fetch'es.  (But it's been around for a couple of years, so who knows.)
>
>         At any rate, what can I do to recover from this situation?  I tried to locate a path with multiple index entries like this, but got no results:
>
> $ git ls-files -s | cut -f 2-100 | sort | uniq -c | grep -v '^[ \t]*1 '
>
>         (I originally posted on SO at http://stackoverflow.com/questions/30264826/; I'll update that with any solutions that come up here, to ease future googling.)
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Duy NguyenNext: McHenry, Matt
Message 14 of 17 in “recovering from "unordered stage entries in index" error”
  1. McHenry, MattMay 19, 2015
  2. Junio C HamanoMay 19, 2015
  3. McHenry, MattMay 19, 2015
  4. Duy NguyenMay 21, 2015
  5. McHenry, MattMay 21, 2015
  6. Junio C HamanoMay 21, 2015
  7. Duy NguyenMay 22, 2015
  8. McHenry, MattMay 22, 2015
  9. Duy NguyenMay 23, 2015
  10. McHenry, MattMay 23, 2015
  11. Duy NguyenMay 24, 2015
  12. McHenry, MattMay 26, 2015
  13. Duy NguyenMay 26, 2015
  14. Junio C HamanoMay 22, 2015
  15. McHenry, MattMay 22, 2015
  16. Junio C HamanoMay 23, 2015
  17. McHenry, MattMay 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.