aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorilovezfs2017-11-21 08:16:12 -0800
committerilovezfs2017-11-21 08:16:12 -0800
commit590ba4cbf6f11f4e7fa4c68984cc91fa3b25fcbf (patch)
treee00033c6b70f8e9514d08ad9497d5859fef96b18 /Library/Homebrew/dev-cmd
parent236b0172306a6f4b233d374fcc20adce5c3e3261 (diff)
downloadbrew-590ba4cbf6f11f4e7fa4c68984cc91fa3b25fcbf.tar.bz2
bump-formula-pr: fix for when hub isn't configured
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/bump-formula-pr.rb28
1 files changed, 23 insertions, 5 deletions
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index 236ef8f70..6f7cc13c2 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -321,23 +321,41 @@ module Homebrew
end
if ARGV.dry_run?
+ ohai "hub fork # read $HUB_REMOTE"
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 # read $HUB_REMOTE"
ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}"
ohai "hub pull-request #{hub_args.join(" ")} -m '#{formula.name} #{new_formula_version}#{devel_message}'"
ohai "git checkout -"
else
+ reply = IO.popen(["hub", "fork"], "r+", err: "/dev/null") do |io|
+ reader = Thread.new { io.read }
+ sleep 1
+ io.close_write
+ reader.value
+ end
+
+ if reply.to_s.include? "username:"
+ formula.path.atomic_write(backup_file) unless ARGV.dry_run?
+ odie "You need to configure hub"
+ end
+
+ remote = reply[/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?
+
+ if remote.to_s.empty?
+ formula.path.atomic_write(backup_file) unless ARGV.dry_run?
+ odie "cannot get remote from 'hub'!"
+ end
+
safe_system "git", "fetch", "--unshallow", "origin" if shallow
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
safe_system "git", "commit", "--no-edit", "--verbose",
"--message=#{formula.name} #{new_formula_version}#{devel_message}",
"--", formula.path
- 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
#{formula.name} #{new_formula_version}#{devel_message}