Re: git-checkout sometimes silently fails

From: Jeff King <peff@peff.net>
Date: May 7, 2008, 00:19 UTC
Message-ID: <20080507001919.GA8633@sigill.intra.peff.net>
In-Reply-To: <20080506171052.340d643e.akpm@linux-foundation.org>

On Tue, May 06, 2008 at 05:10:52PM -0700, Andrew Morton wrote:

Show 15 quoted lines

> > > y:/usr/src/git26> git-checkout master
> > > Switched to branch "master"
> > > y:/usr/src/git26> cat kernel/*.c|sum
> > > 34439  2057
> > > y:/usr/src/git26> git-checkout linux-next
> > > Switched to branch "linux-next"
> > > y:/usr/src/git26> cat kernel/*.c|sum     
> > > 34439  2057
> > 
> > This is not a good indication of a failed checkout (they could point
> > to the same commit, for one).
> 
> How could they?  linux-next includes a directory called ./Next and a file
> in that directory called ./Next/Trees, and that is not present after the
> `git-checkout linux-next'.

But you don't show us that in your example. There is nothing in your example to indicate that they are not simply pointing at the same commit...

Show 5 quoted lines

> > Try "gitk master...linux-next" (or "git
> > log master..linux-next", "git diff master linux-next")
> 
> These come up empty.  But there is a 12.4MB diff between mainline and
> linux-next.

And if these all come up empty, then they _are_ pointing to the same commit. When you say "but there is a 12.4MB diff..." do you mean "there _should_ be such a diff?" In that case, it seems that your linux-next ref is pointing to an unexpected commit.

So the problem is not with git-checkout, but rather that you are not checking out what you think you are checking out. And so we need to figure out how you got into that state.

What command did you use to create the linux-next branch? Have you used git-reset to move the branch tip around?

-Peff