git轨道分支与不同的名称

Question

我有一个跟踪非默认分支的仓库.因此,有一个名为"master"的本地分支应该跟踪"origin/master-13.07".我已经完成了"push -u",我相信它应该足够了,分支被跟踪.输出git branch -vv:

C:\work\repo>git branch -vv
  stuff     68792df [origin/stuff-13.07] Small bugfix
* master 68792df [origin/master-13.07: ahead 1] Small bugfix

输出 git status

C:\work\repo>git status
# On branch master
# Your branch is ahead of 'origin/master-13.07' by 1 commit.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

一切似乎都没问题,但是当我只使用"git push"(正如git推荐我上面)时,它失败了:

C:\work\repo>git push
fatal: The upstream branch of your current branch does not match
the name of your current branch.  To push to the upstream branch
on the remote, use

    git push origin HEAD:master-13.07

To push to the branch of the same name on the remote, use

    git push origin master

是的,我知道这个名字不匹配,这正是我想要的,我告诉他们通过"push -u"来git.为什么我不能只使用"推"？

C:\work\repo>git --version
git version 1.8.3.msysgit.0

C:\work\repo>git config push.default
simple

Answer 1

好.通过您添加的信息,我认为您只需要更改push.default为值upstream.

您可能在升级Git并看到此消息后配置了实际值:

warning: push.default is unset; its implicit value is changing in 
Git 2.0 from 'matching' to 'simple'. To squelch this message 
and maintain the current behavior after the default changes, use: 

  git config --global push.default matching

To squelch this message and adopt the new behavior now, use: 

  git config --global push.default simple

根据文档,simple当分支名称不同时,值必须拒绝推送.请参阅Git Config(搜索push.default).