From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: bug in checkout/status ?
Date: Thu, 5 Mar 2009 13:13:53 -0800 [thread overview]
Message-ID: <20090305211353.GC16213@spearce.org> (raw)
In-Reply-To: <20090305210757.GA20157@coredump.intra.peff.net>
Jeff King <peff@peff.net> wrote:
> 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.
prev parent reply other threads:[~2009-03-05 21:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-05 20:48 bug in checkout/status ? Shawn O. Pearce
2009-03-05 20:51 ` Jeff King
2009-03-05 20:53 ` Shawn O. Pearce
2009-03-05 21:07 ` Jeff King
2009-03-05 21:13 ` Shawn O. Pearce [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090305211353.GC16213@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.