Re: bug in checkout/status ?

From: Shawn O. Pearce <spearce@spearce.org>
Date: Mar 5, 2009, 21:13 UTC
Message-ID: <20090305211353.GC16213@spearce.org>
In-Reply-To: <20090305210757.GA20157@coredump.intra.peff.net>

Jeff King <peff@peff.net> wrote:

Show 5 quoted lines

> On Thu, Mar 05, 2009 at 12:53:13PM -0800, Shawn O. Pearce wrote:
> 
> 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:

I never would have guessed the sorting was wrong.  But once you
said something, it was immediately obvious to me that JGit f'd up
the tree.

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

Well, I rewound the repository. We're rebasing the change onto the current tip and pushing a fast-forward instead of letting JGit make a merge commit here.

But JGit still has a bug that causes it to corrupt the tree sorting here. I have yet to understand why it produced that bad sort for this particular merge, let alone propose a patch for it.

Thanks for the help Peff.

-- 
Shawn.