From: "McHenry, Matt" <mmchenry@carnegielearning.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: RE: recovering from "unordered stage entries in index" error
Date: Tue, 26 May 2015 09:28:33 -0400 [thread overview]
Message-ID: <D377A9280DB18546A2471214D5CBB0E9087568F735@exchdb01> (raw)
In-Reply-To: <CACsJy8B=ttGa1aBKTdZAe6bLN4rbEE1r3fA+ifNNvUWhYD0Yfg@mail.gmail.com>
> 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 index
write-tree: command returned error: 128
$ egrep -i 'read|tree|update|index' /tmp/git-trace
13:26:08.169921 git.c:348 trace: built-in: git 'write-tree'
$ cat /tmp/git-trace
09:26:07.402735 git.c:557 trace: exec: 'git-svn' 'fetch'
09:26:07.402784 run-command.c:351 trace: run_command: 'git-svn' 'fetch'
09:26:07.688866 git.c:348 trace: built-in: git 'rev-parse' '--show-prefix'
13:26:07.691207 git.c:348 trace: built-in: git 'rev-parse' '--git-dir'
13:26:07.693228 git.c:348 trace: built-in: git 'rev-parse' '--show-cdup'
13:26:07.695594 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.quiet'
13:26:07.697279 git.c:348 trace: built-in: git 'config' '--get' 'svn.authorsprog'
13:26:07.699030 git.c:348 trace: built-in: git 'config' '--get' 'svn.ignorepaths'
13:26:07.700914 git.c:348 trace: built-in: git 'config' '--get' 'svn.authorsfile'
13:26:07.702872 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.followparent'
13:26:07.704949 git.c:348 trace: built-in: git 'config' '--get' 'svn.configdir'
13:26:07.706674 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.localtime'
13:26:07.708590 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.useSvmProps'
13:26:07.710669 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.useSvnsyncProps'
13:26:07.712602 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.noauthcache'
13:26:07.714527 git.c:348 trace: built-in: git 'config' '--get' 'svn.username'
13:26:07.716257 git.c:348 trace: built-in: git 'config' '--int' '--get' 'svn.logwindowsize'
13:26:07.717872 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.noMetadata'
13:26:07.719905 git.c:348 trace: built-in: git 'config' '--get' 'svn.ignorerefs'
13:26:07.721623 git.c:348 trace: built-in: git 'config' '--get' 'svn.includepaths'
13:26:07.723485 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.nocheckout'
13:26:07.725441 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.addauthorfrom'
13:26:07.727125 git.c:348 trace: built-in: git 'config' '--get' 'svn.repackflags'
13:26:07.729179 git.c:348 trace: built-in: git 'config' '--int' '--get' 'svn.repack'
13:26:07.731143 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.uselogauthor'
13:26:07.733139 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.parent'
13:26:07.734911 git.c:348 trace: built-in: git 'config' '--bool' '--get' 'svn.fetchall'
13:26:07.736992 git.c:348 trace: built-in: git 'config' '--get' 'svn.revision'
13:26:07.739398 git.c:348 trace: built-in: git 'rev-parse' '--symbolic' '--all'
13:26:07.744514 git.c:348 trace: built-in: git 'config' '-l'
13:26:07.746770 git.c:348 trace: built-in: git 'config' '-l'
13:26:07.749108 git.c:348 trace: built-in: git 'config' '--bool' 'svn.useSvmProps'
13:26:07.751613 git.c:348 trace: built-in: git 'config' '-l'
13:26:07.907707 git.c:348 trace: built-in: git 'config' '--int' '--get' 'svn-remote.svn.branches-maxRev'
13:26:07.910171 git.c:348 trace: built-in: git 'config' '--int' '--get' 'svn-remote.svn.tags-maxRev'
13:26:07.912608 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.url'
13:26:07.915539 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.pushurl'
13:26:07.917825 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.uuid'
13:26:07.919620 git.c:348 trace: built-in: git 'rev-parse' '--verify' 'refs/remotes/trunk^0'
13:26:07.923752 git.c:348 trace: built-in: git 'rev-list' '--pretty=raw' '--reverse' '74332b7d653cde7ba3b999cc7b0adcfd9d924440..refs/remotes/trunk' '--'
13:26:07.926128 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.rewriteRoot'
13:26:07.928707 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.rewriteUUID'
13:26:07.933621 git.c:348 trace: built-in: git 'cat-file' '--batch'
13:26:08.150396 git.c:348 trace: built-in: git 'config' 'svn-remote.svn.branches-maxRev' '231655'
13:26:08.152963 git.c:348 trace: built-in: git 'config' 'svn-remote.svn.tags-maxRev' '231655'
13:26:08.155457 git.c:348 trace: built-in: git 'rev-parse' '--verify' 'refs/remotes/trunk^0'
13:26:08.158789 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.usesvmprops'
13:26:08.160929 git.c:348 trace: built-in: git 'config' '--get' 'svn-remote.svn.nometadata'
13:26:08.164778 git.c:348 trace: built-in: git 'cat-file' 'commit' '74332b7d653cde7ba3b999cc7b0adcfd9d924440'
13:26:08.169921 git.c:348 trace: built-in: git 'write-tree'
next prev parent reply other threads:[~2015-05-26 13:29 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
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 [this message]
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=D377A9280DB18546A2471214D5CBB0E9087568F735@exchdb01 \
--to=mmchenry@carnegielearning.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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).