如何将本地不同的 Git 分支推送到 Heroku/master

发布于 2024-09-04 23:12:20 字数 1401 浏览 4 评论 0原文

Heroku 的政策是忽略除“master”之外的所有分支。

虽然我确信 Heroku 的设计者对这个政策有很好的理由（我猜测是为了存储和性能优化），但对我作为开发人员来说，结果是无论我正在研究什么本地主题分支，我都想要一种简单的方法将 Heroku 的 master 切换到本地主题分支，并执行“git push heroku -f”来覆盖 Heroku 上的 master。

我从阅读 http://progit.org/book/ch9 的“Pushing Refspecs”部分得到了什么-5.html 是

git push -f heroku local-topic-branch:refs/heads/master

我真正想要的一种在配置文件中进行设置的方法，以便“git push heroku”始终执行上述操作，替换 local-topic-branch 与我当前分支的名称相同。如果有人知道如何实现这一点，请告诉我！

当然，需要注意的是，只有当我是唯一可以推送到该 Heroku 应用程序/存储库的人时，这才是明智的。测试或 QA 团队可能会管理这样的存储库来尝试不同的候选分支，但他们必须进行协调，以便他们都同意在任何一天推送到哪个分支。

不用说，拥有一个单独的远程存储库（如 GitHub）并且没有此限制来备份所有内容也是一个非常好的主意。我将其称为“origin”，并为 Heroku 使用“heroku”，以便“git Push”始终将所有内容备份到 origin，而“git Push heroku”则将我当前所在的任何分支推送到 Heroku 的 master 分支，并覆盖它如果需要的话。

这行得通吗？

[remote "heroku"]
    url = [email protected]:my-app.git
    push = +refs/heads/*:refs/heads/master

在开始实验之前，我想听听更有经验的人的意见，尽管我想我可以在 Heroku 上创建一个虚拟应用程序并进行实验。

至于获取，我并不关心 Heroku 存储库是否是只写的。我仍然有一个单独的存储库，例如 GitHub，用于备份和克隆我的所有工作。

脚注：这个问题类似于，但不完全相同 使用 Heroku 的分支策略进行良好的 Git 部署？

原文

Heroku has a policy of ignoring all branches but 'master'.

While I'm sure Heroku's designers have excellent reasons for this policy (I'm guessing for storage and performance optimization), the consequence to me as a developer is that whatever local topic branch I may be working on, I would like an easy way to switch Heroku's master to that local topic branch and do a "git push heroku -f" to over-write master on Heroku.

What I got from reading the "Pushing Refspecs" section of http://progit.org/book/ch9-5.html is

git push -f heroku local-topic-branch:refs/heads/master

What I'd really like is a way to set this up in the configuration file so that "git push heroku" always does the above, replacing local-topic-branch with the name of whatever my current branch happens to be. If anyone knows how to accomplish that, please let me know!

The caveat for this, of course, is that this is only sensible if I am the only one who can push to that Heroku app/repository. A test or QA team might manage such a repository to try out different candidate branches, but they would have to coordinate so that they all agree on what branch they are pushing to it on any given day.

Needless to say, it would also be a very good idea to have a separate remote repository (like GitHub) without this restriction for backing everything up to. I'd call that one "origin" and use "heroku" for Heroku so that "git push" always backs up everything to origin, and "git push heroku" pushes whatever branch I'm currently on to Heroku's master branch, overwriting it if necessary.

Would this work?

[remote "heroku"]
    url = [email protected]:my-app.git
    push = +refs/heads/*:refs/heads/master

I'd like to hear from someone more experienced before I begin to experiment, although I suppose I could create a dummy app on Heroku and experiment with that.

As for fetching, I don't really care if the Heroku repository is write-only. I still have a separate repository, like GitHub, for backup and cloning of all my work.

Footnote: This question is similar to, but not quite the same as Good Git deployment using branches strategy with Heroku?

分享到QQ

分享到微博

如果你对这篇内容有疑问，欢迎到本站社区发帖提问参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。

发布评论

需要登录才能够评论，你可以免费注册一个本站的账号。

清风无影 2024-09-11 23:12:20

请参阅https://devcenter.heroku.com/articles/git#deploying-code

$ git push heroku yourbranch:main

See https://devcenter.heroku.com/articles/git#deploying-code

$ git push heroku yourbranch:main

回复收藏 0 原文

蛮可爱 2024-09-11 23:12:20

使用通配符时，它必须出现在 refspec 的两侧，因此 +refs/heads/*:refs/heads/master 将不起作用。但您可以使用 +HEAD:refs/heads/master ：

git config remote.heroku.push +HEAD:refs/heads/master

此外，您可以直接使用 git push 来执行此操作：

git push heroku +HEAD:master
git push -f heroku HEAD:master

When using a wildcard, it had to be present on both sides of the refspec, so +refs/heads/*:refs/heads/master will not work. But you can use +HEAD:refs/heads/master:

git config remote.heroku.push +HEAD:refs/heads/master

Also, you can do this directly with git push:

git push heroku +HEAD:master
git push -f heroku HEAD:master

回复收藏 0 原文

十二 2024-09-11 23:12:20

git push -f heroku local_branch_name:master

git push -f heroku local_branch_name:master

回复收藏 0 原文

又爬满兰若 2024-09-11 23:12:20

对我来说，它有效，

git push -f heroku otherBranch:master

建议使用 -f（强制标志）以避免与其他开发人员的推送发生冲突。由于您不使用 Git 进行版本控制，而仅将其用作传输，因此使用强制标志是一种合理的做法。

来源：- 官方文档

For me, it works,

git push -f heroku otherBranch:master

The -f (force flag) is recommended in order to avoid conflicts with other developers’ pushes. Since you are not using Git for your revision control, but as a transport only, using the force flag is a reasonable practice.

source :- offical docs

回复收藏 0 原文

画离情绘悲伤 2024-09-11 23:12:20

将不同本地 Git 分支推送到 Heroku/master 的最安全命令。

git push -f heroku branch_name:master

注意：虽然您可以在不使用 -f 的情况下进行推送，但建议使用 -f（强制标志）以避免与其他开发人员的推送发生冲突。

The safest command to push different local Git branches to Heroku/master.

git push -f heroku branch_name:master

Note: Although, you can push without using the -f, the -f (force flag) is recommended in order to avoid conflicts with other developers’ pushes.

回复收藏 0 原文

我还不会笑 2024-09-11 23:12:20

另请注意，如果您使用 git flow 系统并且可能会调用您的功能分支，

feature/mobile_additions

并且使用名为 stagingtwo 的 git 远程，那么推送到 heroku 的命令将是

git push stagingtwo feature/mobile_additions:master

Also note that if your using the git flow system and your feature branch might be called

feature/mobile_additions

and with a git remote called stagingtwo, then the command to push to heroku would be

git push stagingtwo feature/mobile_additions:master

回复收藏 0 原文

浮生面具三千个 2024-09-11 23:12:20

git push heroku $(git branch --show-current):master

交替：

git push heroku HEAD:master

git push heroku $(git branch --show-current):master

Alternately:

git push heroku HEAD:master

回复收藏 0 原文

债姬 2024-09-11 23:12:20

你应该看看heroku_san，它很好地解决了这个问题。

例如，您可以：

git checkout BRANCH
rake qa deploy

它还可以轻松启动新的 Heroku 实例以将主题分支部署到新服务器：

git checkout BRANCH
# edit config/heroku.yml with new app instance and shortname
rake shortname heroku:create deploy # auto creates deploys and migrates

当然，如果您经常执行某些操作，您可以执行更简单的 rake 任务。

You should check out heroku_san, it solves this problem quite nicely.

For example, you could:

git checkout BRANCH
rake qa deploy

It also makes it easy to spin up new Heroku instances to deploy a topic branch to new servers:

git checkout BRANCH
# edit config/heroku.yml with new app instance and shortname
rake shortname heroku:create deploy # auto creates deploys and migrates

And of course you can make simpler rake tasks if you do something frequently.

回复收藏 0 原文