From: Johannes Sixt <j.sixt@viscovery.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alex Riesen <raa.lkml@gmail.com>, git@vger.kernel.org
Subject: Re: git-checkout sometimes silently fails
Date: Wed, 07 May 2008 10:51:57 +0200 [thread overview]
Message-ID: <48216DAD.50902@viscovery.net> (raw)
In-Reply-To: <20080506171052.340d643e.akpm@linux-foundation.org>
Andrew Morton schrieb:
> y:/usr/src/git26> git-branch -av | grep '^\*'
> * master 5717922 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
> y:/usr/src/git26> git-checkout linux-next
> Switched to branch "linux-next"
> y:/usr/src/git26> git-branch -av | grep '^\*'
> * linux-next 5717922 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
You did not show us the output of 'git branch -av'. Do you happen to see
something like this in the output:
* master 5717922 Merge branch 'for_linus'
linux-next 5717922 Merge branch 'for_linus'
linux-next/HEAD 1234567 Something completely different
linux-next/master 1234567 Something completely different
In this case, your local branch 'linux-next' is probably a left-over from
earlier experiments. The last two branches are actually what you want to
refer to. Normally, the 'linux-next/HEAD' part allows you to refer to
'linux-next/master' by saying simply 'linux-next'. But unfortunately, your
local branch name 'linux-next' takes precedence.
'git fetch' never updates your local branch, but only 'linux-next/master'
(and its alias 'linux-next/HEAD' aka 'linux-next').
To return to a sane state, do 'git branch -D linux-next'.
-- Hannes
prev parent reply other threads:[~2008-05-07 8:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 19:22 git-checkout sometimes silently fails Andrew Morton
2008-05-06 21:50 ` Alex Riesen
2008-05-07 0:10 ` Andrew Morton
2008-05-07 0:19 ` Junio C Hamano
2008-05-07 0:43 ` Andrew Morton
2008-05-07 15:09 ` J. Bruce Fields
2008-05-07 0:19 ` Jeff King
2008-05-07 0:54 ` Andrew Morton
2008-05-07 1:32 ` Björn Steinbrink
2008-05-07 8:51 ` Johannes Sixt [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=48216DAD.50902@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).