From mboxrd@z Thu Jan 1 00:00:00 1970 From: Duy Nguyen Subject: Re: recovering from "unordered stage entries in index" error Date: Sat, 23 May 2015 09:06:41 +0700 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Junio C Hamano , "git@vger.kernel.org" To: "McHenry, Matt" X-From: git-owner@vger.kernel.org Sat May 23 04:07:20 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YvyqM-0008Px-Vp for gcvg-git-2@plane.gmane.org; Sat, 23 May 2015 04:07:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756546AbbEWCHN (ORCPT ); Fri, 22 May 2015 22:07:13 -0400 Received: from mail-ig0-f179.google.com ([209.85.213.179]:37179 "EHLO mail-ig0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756390AbbEWCHM (ORCPT ); Fri, 22 May 2015 22:07:12 -0400 Received: by igbsb11 with SMTP id sb11so3194060igb.0 for ; Fri, 22 May 2015 19:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=upCZ9VMBp3MOp+Nr2o5QWmfsKgs3X4OYgT3IHGl66YM=; b=yqiqLsBYPk/QnRn3W0zf+56DfIwpg8kEB4eUNxFbq/0+0V6p21F8PG0+kB7JvM54t4 43gKm2LsauvyfxOfT9ELL4l0011MLxCwiokJ66La7QnBIWuZ1oH0LN5choyU/9tDtPzZ 6yCZDhN3M4PkCGxmqKoljBLmfvBPODwMYUsh8k95AU8uvYzU5HKbh1eVeggRcowCfRq9 2+aE2dFFiyEma5UO7NCQyW7VFTKEjI7JKEB9RpX4kb7MicrW6UWPxjAfPNya2aaxXAM3 +M9cXDSFIeidkaQeEIbPeJm6TjNJX228B+kQs+5ENtGmTBSzTLrO5c1m4p7b+VUGm2X0 6+dA== X-Received: by 10.50.142.67 with SMTP id ru3mr9450006igb.40.1432346831607; Fri, 22 May 2015 19:07:11 -0700 (PDT) Received: by 10.107.181.136 with HTTP; Fri, 22 May 2015 19:06:41 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Sat, May 23, 2015 at 1:56 AM, McHenry, Matt 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 chance of bugs in update-index that produces broken index, it's probably read-tree in this case because it assumes good order from the source tree object, which is(?) generated by git-svn. And the write-tree message supports this (the code does read-tree then write-tree). 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 " before "fatal: unorder...". You can then use git ls-tree to examine this tree, try to sort the file list with "LANG=C sort" and compare with the original list. -- Duy