Re: bug in checkout/status ?

From: Jeff King <peff@peff.net>
Date: Mar 5, 2009, 21:07 UTC
Message-ID: <20090305210757.GA20157@coredump.intra.peff.net>
In-Reply-To: <20090305205313.GB16213@spearce.org>

On Thu, Mar 05, 2009 at 12:53:13PM -0800, Shawn O. Pearce wrote:

Show 9 quoted lines

> > Hmm. I get the same behavior here. I notice there is a "libelf" subtree
> > before "libelf-po"; maybe it's a sorting bug? I'll try to investigate
> > more.
> 
> Yup, that must be it.
> 
> JGit created the resulting tree during a merge.
> 
> It sorted "libelf/" before "libelf-po/".  Wrong.  Bad JGit.  Bad!

OK. I was just sort of guessing based on the similarity of the names and the fact that sorting is confusing (as evidenced by the fact that I had no idea if it was wrong or not). But that is definitely it:

  $ git clone git://android.git.kernel.org/platform/external/elfutils std_git
  $ cd std_git
  $ git ls-tree HEAD >jgit
  $ git commit -a -m 'git tree'
  $ git ls-tree HEAD >git
  $ diff -u jgit git

reveal(ed) the difference. But it looks like you have already re-pushed a fixed version.

-Peff