admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #760 from jasonkarns/bump-formula-pr-return-to-branch

Browse Source 
bump-formula-pr: return to starting branch
This commit is contained in:
Martin Afanasjew 2016-08-20 11:36:43 +02:00 committed by GitHub
commit bb4d168c48
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -147,6 +147,7 @@ module Homebrew
ohai "hub fork (to read $HUB_REMOTE)" ohai "hub fork (to read $HUB_REMOTE)"
ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}" ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}"
ohai "hub pull-request --browse -m '#{formula.name} #{new_formula_version}#{devel_message}'" ohai "hub pull-request --browse -m '#{formula.name} #{new_formula_version}#{devel_message}'"
ohai "git checkout -"
else else
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master" safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
safe_system "git", "commit", "--no-edit", "--verbose", safe_system "git", "commit", "--no-edit", "--verbose",
@ -159,6 +160,7 @@ module Homebrew
safe_system "git", "push", "--set-upstream", remote, "#{branch}:#{branch}" safe_system "git", "push", "--set-upstream", remote, "#{branch}:#{branch}"
safe_system "hub", "pull-request", "--browse", "-m", safe_system "hub", "pull-request", "--browse", "-m",
"#{formula.name} #{new_formula_version}#{devel_message}\n\nCreated with `brew bump-formula-pr`." "#{formula.name} #{new_formula_version}#{devel_message}\n\nCreated with `brew bump-formula-pr`."
safe_system "git", "checkout", "-"
end end
end end
end end