From: Marc Strapetz <marc.strapetz@syntevo.com>
To: git@vger.kernel.org
Subject: branch --set-upstream-to unexpectedly fails with "starting point ... is no branch"
Date: Mon, 23 Nov 2015 12:04:50 +0100 [thread overview]
Message-ID: <5652F2D2.3050902@syntevo.com> (raw)
There is a strange "branch --set-upstream-to" failure for "clones" which
haven't been created using "git clone" but constructed using "git init",
"git remote add" and "git fetch".
Following script first creates a "main" repository and then constructs
the clone. Finally, in the clone branches origin/1 and origin/2 will be
present, however it's not possible to invoke "git branch
--set-upstream-to" for origin/2 (it works fine for origin/1).
I guess the behavior is related to following line in .git/config:
fetch = refs/heads/1:refs/remotes/origin/1
However, I don't understand what's the problem for Git here? Definitely
the error "starting point 'origin/2' is not a branch" is wrong.
$ git --version
git version 2.5.0.windows.1
$ cd /tmp/gittest
$ mkdir main
$ cd main
$ git init
$ touch file
$ git add file
$ git commit -m "import"
$ git branch 1
$ git branch 2
$ git branch
1
2
* master
$ cd /tmp/gittest
$ mkdir clone
$ cd clone
$ git init
Initialized empty Git repository in /tmp/gittest/clone/.git/
$ git remote add origin /tmp/gittest/main
$ git config remote.origin.fetch refs/heads/1:refs/remotes/origin/1
$ git fetch origin
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /tmp/gittest/main
* [new branch] 1 -> origin/1
$ git fetch origin refs/heads/2:refs/remotes/origin/2
From /tmp/gittest/main
* [new branch] 2 -> origin/2
$ git branch --no-track 2 refs/remotes/origin/2
$ git branch
2
# HERE COMES THE STRANGE FAILURE:
$ git branch --set-upstream-to=origin/2 2
fatal: Cannot setup tracking information; starting point 'origin/2' is
not a branch.
# THIS WORKS AS EXPECTED:
$ git branch --set-upstream-to=origin/1 2
Branch 2 set up to track remote branch 1 from origin by rebasing.
-Marc
next reply other threads:[~2015-11-23 11:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 11:04 Marc Strapetz [this message]
2015-11-23 17:04 ` branch --set-upstream-to unexpectedly fails with "starting point ... is no branch" Carlos Martín Nieto
2015-11-23 18:59 ` Marc Strapetz
2015-11-24 16:58 ` Carlos Martín Nieto
2015-11-25 16:27 ` Marc Strapetz
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=5652F2D2.3050902@syntevo.com \
--to=marc.strapetz@syntevo.com \
--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 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.