blocks|key|2864897|text|您已经总结了问题中的差异。upstream推送到已配置的上游分支，而current假定上游分支与当前本地分支同名，并推送到该特定名称。实际上，没有理由假设本地分支的上游跟踪分支与本地分支本身具有相同的名称。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2864898|例如，如果您在多个存储库中工作，或者在许多共享的开发人员远程数据库中工作，那么您最终通常会跟踪同一分支的不同分支，例如allen-master或susan-master，这两个分支分别跟踪艾伦和苏珊的存储库中的master分支。在这种情况下，current可能是不正确的设置，因为这些分支名称不存在于它们的远程设备上。然而，upstream可以很好地工作。|2864899|一个更实际的例子可能是同时跟踪development和production存储库。您的工作流程可能会使用不同的主线分支，但这可能会让人感到困惑。假设您是一名代码集成者，希望分别跟踪两个存储库的master分支。|2864900|git+checkout+-b+production+--track+production/master
git+checkout+-b+development+--track+development/master|code-block|syntax|javascript|2864901|现在，您已经有了两个跟踪各自存储库的分支，这两个分支都不使用master命名约定。分支名称很容易混淆:它们显式地描述了它们跟踪的内容。然而，push.default+=+current没有任何意义，因为两个remote都不包含development或production分支。|2864902|entityMap^0|D|8|Y|7|0|1N|C|20|C|2X|6|3D|7|4I|8|0|F|B|R|A|2O|6|0|0|U|6|1Y|M|35|B|3H|A|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|X|8|@$9|Y|A|Z|B|C]|$9|10|A|11|B|C]|$9|12|A|13|B|C]|$9|14|A|15|B|C]|$9|16|A|17|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|18|8|@$9|19|A|1A|B|C]|$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]]|D|@]|E|$]]|$1|J|3|K|5|L|7|1F|8|@]|D|@]|E|$M|N]]|$1|O|3|P|5|6|7|1G|8|@$9|1H|A|1I|B|C]|$9|1J|A|1K|B|C]|$9|1L|A|1M|B|C]|$9|1N|A|1O|B|C]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]]|R|$]]

You've summarized the difference in your question. <code>upstream</code> pushes to the configured upstream branch, while <code>current</code> assumes the upstream branch has the same name as the current local branch, and pushes to that specific name. In reality, there's no reason to assume a local branch's upstream tracking branch has the same name as the local branch itself. 

For example, if you work in multiple repositories or across many shared developer remotes, you often end up tracking different forks of the same branch, such as <code>allen-master</code> or <code>susan-master</code>, both of which track the <code>master</code> branch in Allen and Susan's repos, respectively. In this case, <code>current</code> would be the incorrect setting, because those branch names don't exist on their remotes. <code>upstream</code>, however, would work just fine.

A more practical example might be tracking both a <code>development</code> and <code>production</code> repository. Your workflow might use a different mainline branch for each, but that might get confusing. Suppose you were a code integrator and wanted to track both repositories' <code>master</code> branches separately.

<pre><code>git checkout -b production --track production/master
git checkout -b development --track development/master
</code></pre>

Now you've got two branches that track their respective repositories, neither of which use the <code>master</code> naming convention at all. There's little confusion about the branch names: They explicitly describe what they track. Nevertheless, <code>push.default = current</code> wouldn't make any sense as neither remote contains a <code>development</code> or <code>production</code> branch.

blocks|key|218261|text|current会将当前分支推送到远程存储库上具有相同名称的分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|218262|upstream会将当前分支推送到上游分支。|218263|上游分支是已显式或隐式定义为当前分支上游的分支。这意味着默认情况下推送和拉取将与此分支同步。上游分支可以在与当前分支本身相同的存储库中。您可以做一些有趣的事情，比如将本地主分支设置为本地功能(主题)分支的上游，并在它们之间进行推拉。|218264|隐式上行设置通过branch.autosetupmerge配置值完成。您可以在git+config帮助页面中找到文档。显式上行设置是通过git+branch命令的-u选项完成的。有关详细信息，请参阅帮助页面。|218265|entityMap^0|0|7|0|0|8|0|0|8|L|13|A|1W|A|29|2|0^^$0|@$1|2|3|4|5|6|7|N|8|@$9|O|A|P|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|T|8|@]|D|@]|E|$]]|$1|J|3|K|5|6|7|U|8|@$9|V|A|W|B|C]|$9|X|A|Y|B|C]|$9|Z|A|10|B|C]|$9|11|A|12|B|C]]|D|@]|E|$]]|$1|L|3|-4|5|6|7|13|8|@]|D|@]|E|$]]]|M|$]]

<code>current</code> will push the current branch to a branch with the same name on the remote repo.

<code>upstream</code> will push the current branch to the upstream branch.

The upstream branch is a branch which has been explicitly or implicitly defined as being upstream from your current branch. That means that push and pull by default will sync with this branch. The upstream branch may be in the same repo as the current branch itself. You can do interesting things like set up your local master branch as upstream from your local feature (topic) branch, and push and pull between them.

Implicit upstream setup is done through the <code>branch.autosetupmerge</code> config value. You can find documentation in the <code>git config</code> help page. Explicit upstream setup is done with the <code>-u</code> option to the <code>git branch</code> command. See the help page for details.

The man page for git-config lists these options for push.default:

<pre><code>nothing - do not push anything.
matching - push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default.
upstream - push the current branch to its upstream branch.
tracking - deprecated synonym for upstream.
current - push the current branch to a branch of the same name.
</code></pre>

In most cases I would assume that pushing to a branch's upstream branch would be the same as pushing to a branch of the same name, since the upstream branch would normally have the same name, and since the branch of the same name ("current") would normally (or always, by definition?) be upstream. So what's the difference?

UPDATE: <a href="https://www.kernel.org/pub/software/scm/git/docs/git-config.html">The man page for git-config</a> has been updated (as one would expect), so the distinctions made <a href="https://www.kernel.org/pub/software/scm/git/docs/git-config.html">there</a> may be a lot clearer now.

What is the difference between git push.default=current and push.default=upstream?

数据库

git-config的手册页列出了push.default的以下选项：nothing - do not push anything.matching - push all matching branches. All branches having the same name in both ends are cons...

问git push.default=current和push.default=upstream有什么不同？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git push.default=current和push.default=upstream有什么不同？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git push.default=current和push.default=upstream有什么不同？
EN