All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kendall Shaw <kshaw@kendallshaw.com>
To: Git List <git@vger.kernel.org>
Subject: Setting of push.default or confusion about refspecs
Date: Mon, 03 Jun 2013 15:01:41 -0700	[thread overview]
Message-ID: <51AD1245.9050202@kendallshaw.com> (raw)

I am setting up a git repository which I cloned using git svn. git 
ls-remote shows something like:

...
refs/remotes/trunk
refs/remotes/2.0.2a
...

To get the subversion branch names to appear as a local branch, I:

git remote add blah http://example.com/blah
git fetch blah +refs/remotes/*:refs/heads/*

I have made changes now that are okay to be in master in my local 
repository and I want to push them to the remote repository. The current 
branch is master.

git push

complains that push.default is not set. Now, I am confused by the 
documentation.

push.default settings refer to either "the upstream branch" or a branch 
with "the same name".

What is "the same name"? Are these the same name:

master
refs/remotes/origin/master

also, after the fetch above, are these the same name:

refs/heads/something
refs/remotes/something

Regarding the upstream branch, I have in .git/config

[remote "origin"]
url = http://example.com/blah
fetch = +refs/heads/*:refs/remotes/origin/*

[branch "master"]
remote = origin
merge = refs/heads/master

git config -l shows

branch.master.remote=origin
branch.master.merge=refs/heads/master

When in branch master, is the upstream branch refs/heads/master?

Then, I think I can get push to push to refs/remotes/origin/master by 
setting push.default to upstream, is that right?

In case "master" is not the same name as "refs/remotes/origin/master", 
can you give me an example of branches with the same name that push 
would push to when push.default is set to simple?

Kendall

             reply	other threads:[~2013-06-03 22:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-03 22:01 Kendall Shaw [this message]
2013-06-03 23:21 ` Setting of push.default or confusion about refspecs Kendall Shaw

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=51AD1245.9050202@kendallshaw.com \
    --to=kshaw@kendallshaw.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.