Merge pull request #3061 from mislav/hub-fork-forward-compat
bump-formula-pr: forward compatibility with `hub fork`
This commit is contained in:
commit
929edca531
@ -296,9 +296,7 @@ module Homebrew
|
||||
ohai "git fetch --unshallow origin" if shallow
|
||||
ohai "git checkout --no-track -b #{branch} origin/master"
|
||||
ohai "git commit --no-edit --verbose --message='#{formula.name} #{new_formula_version}#{devel_message}' -- #{formula.path}"
|
||||
ohai "hub fork --no-remote"
|
||||
ohai "hub fork"
|
||||
ohai "hub fork (to read $HUB_REMOTE)"
|
||||
ohai "hub fork # read $HUB_REMOTE"
|
||||
ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}"
|
||||
ohai "hub pull-request --browse -m '#{formula.name} #{new_formula_version}#{devel_message}'"
|
||||
ohai "git checkout -"
|
||||
@ -308,9 +306,9 @@ module Homebrew
|
||||
safe_system "git", "commit", "--no-edit", "--verbose",
|
||||
"--message=#{formula.name} #{new_formula_version}#{devel_message}",
|
||||
"--", formula.path
|
||||
safe_system "hub", "fork", "--no-remote"
|
||||
quiet_system "hub", "fork"
|
||||
remote = Utils.popen_read("hub fork 2>&1")[/fatal: remote (.+) already exists\./, 1]
|
||||
remote = Utils.popen_read("hub fork 2>&1")[/remote:? (\S+)/, 1]
|
||||
# repeat for hub 2.2 backwards compatibility:
|
||||
remote = Utils.popen_read("hub fork 2>&1")[/remote:? (\S+)/, 1] if remote.to_s.empty?
|
||||
odie "cannot get remote from 'hub'!" if remote.to_s.empty?
|
||||
safe_system "git", "push", "--set-upstream", remote, "#{branch}:#{branch}"
|
||||
pr_message = <<-EOS.undent
|
||||
|
Loading…
x
Reference in New Issue
Block a user