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

boneyard-formula-pr: checkout last branch when done

Browse Source 
Make its behavior more consistent with that of bump-formula-pr.
This commit is contained in:
Zhiming Wang 2016-12-06 15:18:53 -05:00
parent 0fe532c242
commit 59f926cfd3
No known key found for this signature in database
GPG Key ID: BBD31D4D110044B8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/boneyard-formula-pr.rb
View File

@ -88,6 +88,8 @@ module Homebrew
ohai "git push $HUB_REMOTE #{branch}:#{branch}"
ohai "hub pull-request -m $'#{formula.name}: migrate to boneyard\\n\\nCreated with `brew boneyard-formula-pr`#{reason}.'"
end
ohai "git checkout -"
else
cd formula.tap.path
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
@ -108,6 +110,8 @@ module Homebrew
EOS
pr_url = Utils.popen_read("hub", "pull-request", "-m", pr_message).chomp
end
safe_system "git", "checkout", "-"
end
if ARGV.dry_run?
@ -128,6 +132,8 @@ module Homebrew
ohai "git push $HUB_REMOTE #{branch}:#{branch}"
ohai "hub pull-request --browse -m $'#{formula.name}: migrate from #{formula.tap.repo}\\n\\nGoes together with $PR_URL\\n\\nCreated with `brew boneyard-formula-pr`#{reason}.'"
end
ohai "git checkout -"
else
cd boneyard_tap.formula_dir
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
@ -153,6 +159,8 @@ module Homebrew
Created with `brew boneyard-formula-pr`#{reason}.
EOS
end
safe_system "git", "checkout", "-"
end
end
end