RE: recovering from unordered stage entries in index error

2015-05-26 Thread McHenry, Matt
see these commands, or something else. Could you try again with GIT_TRACE=/absolute/path/to/some/where instead of GIT_TRACE=2 and post the content of /abso../some/where? It looks the same as far as I can see: $ GIT_TRACE=/tmp/git-trace git svn fetch fatal: unordered stage entries in

Re: recovering from unordered stage entries in index error

2015-05-26 Thread Duy Nguyen
On Tue, May 26, 2015 at 8:28 PM, McHenry, Matt mmche...@carnegielearning.com wrote: see these commands, or something else. Could you try again with GIT_TRACE=/absolute/path/to/some/where instead of GIT_TRACE=2 and post the content of /abso../some/where? It looks the same as far as I

Re: recovering from unordered stage entries in index error

2015-05-24 Thread Duy Nguyen
On Sat, May 23, 2015 at 9:47 AM, McHenry, Matt mmche...@carnegielearning.com wrote: So maybe you can do GIT_TRACE=2 git svn fetch and post the output. I'd expect to see something like git read-tree sha1 before fatal: unorder You can then use git ls-tree sha1 to examine this tree, try to

RE: recovering from unordered stage entries in index error

2015-05-23 Thread McHenry, Matt
are identical From: McHenry, Matt Sent: Friday, May 22, 2015 10:47 PM To: Duy Nguyen Cc: Junio C Hamano; git@vger.kernel.org Subject: RE: recovering from unordered stage entries in index error So maybe you can do GIT_TRACE=2 git svn fetch and post the output. I'd

Re: recovering from unordered stage entries in index error

2015-05-23 Thread Junio C Hamano
McHenry, Matt mmche...@carnegielearning.com writes: Yes, that does turn up some interesting stuff. It looks like the repository contains some paths with non-ASCII characters, for example this one has some en-dashes (U+2013) in its name: Then the recipe in the message

RE: recovering from unordered stage entries in index error

2015-05-22 Thread McHenry, Matt
] On Behalf Of Junio C Hamano Sent: Friday, May 22, 2015 15:25 To: McHenry, Matt Cc: git@vger.kernel.org Subject: Re: recovering from unordered stage entries in index error The message unordered stage entries in index comes only when two adjacent entries in the index are in a wrong order, e.g. test0

RE: recovering from unordered stage entries in index error

2015-05-22 Thread McHenry, Matt
So maybe you can do GIT_TRACE=2 git svn fetch and post the output. I'd expect to see something like git read-tree sha1 before fatal: unorder You can then use git ls-tree sha1 to examine this tree, try to sort the file list with LANG=C sort and compare with the original list.

Re: recovering from unordered stage entries in index error

2015-05-22 Thread Duy Nguyen
On Sat, May 23, 2015 at 1:56 AM, McHenry, Matt mmche...@carnegielearning.com wrote: $ git svn fetch fatal: unordered stage entries in index write-tree: command returned error: 128 git-svn does not create the index manually. It uses update-index or read-tree to do that. While there's still a

RE: recovering from unordered stage entries in index error

2015-05-22 Thread McHenry, Matt
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. I created

Re: recovering from unordered stage entries in index error

2015-05-22 Thread Junio C Hamano
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

RE: recovering from unordered stage entries in index error

2015-05-21 Thread McHenry, Matt
This message can be improved to show what entries have this problem. Yes, that would definitely be a start. :) But then I don't see any way to recover the index manually. ls-files will die too. Perhaps we should be gentle in this case: show warnings Actually, ls-files

Re: recovering from unordered stage entries in index error

2015-05-21 Thread Duy Nguyen
On Tue, May 19, 2015 at 8:48 PM, McHenry, Matt mmche...@carnegielearning.com wrote: 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 This message can be

Re: recovering from unordered stage entries in index error

2015-05-21 Thread Duy Nguyen
On Thu, May 21, 2015 at 11:49 PM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@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

Re: recovering from unordered stage entries in index error

2015-05-21 Thread Junio C Hamano
Duy Nguyen pclo...@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