From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: [funny] "git checkout -t origin/xyzzy" seems to misbehave
Date: Sun, 21 Sep 2008 01:23:00 -0700 [thread overview]
Message-ID: <7v1vzd29i3.fsf@gitster.siamese.dyndns.org> (raw)
When you
* are on a branch "foo" that is not "bar",
* have "origin/bar",
* and already have a local branch "bar",
"git checkout -t origin/bar" seems to misbehave.
$ git clone -s git.junio victim-002
$ cd victim-002
$ git branch
* master
$ git checkout -t origin/next
Branch next set up to track remote branch refs/remotes/origin/next.
Switched to a new branch "next"
$ git checkout -t origin/master
fatal: A branch named 'master' already exists.
$ git branch
master
* next
$ git diff --cached --shortstat
60 files changed, 2378 insertions(+), 3412 deletions(-)
$ git diff --cached master
$ exit
The first "checkout -t" is fine. The failed one seems to have already
updated the index and the work tree when it notices that it cannot create
a new branch.
I suspect "-t" does not have to be in effect to trigger this; in other
words, "git checkout -b master origin/master" would have the same issue.
I'm reporting this before digging it further myself, because I may not be
able to diagnose this before I leave for a vacation.
next reply other threads:[~2008-09-21 8:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-21 8:23 Junio C Hamano [this message]
2008-09-21 17:44 ` [funny] "git checkout -t origin/xyzzy" seems to misbehave Alex Riesen
2008-09-21 18:36 ` Daniel Barkalow
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=7v1vzd29i3.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
/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).