aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Afanasjew2016-08-20 11:36:43 +0200
committerGitHub2016-08-20 11:36:43 +0200
commitbb4d168c4869a6b545250105a6bee43b800018ad (patch)
treea410fdded6d89dacf0a19fef5f03808de4f2d57e
parent27d9e450ffeeede62aabf56a01ecc2e2740ff68b (diff)
parentf40fd1df90345eadf2b5f8eac69f0003617029d4 (diff)
downloadbrew-bb4d168c4869a6b545250105a6bee43b800018ad.tar.bz2
Merge pull request #760 from jasonkarns/bump-formula-pr-return-to-branch
bump-formula-pr: return to starting branch
-rw-r--r--Library/Homebrew/dev-cmd/bump-formula-pr.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index 29f6296c4..0dd82a7d5 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -147,6 +147,7 @@ module Homebrew
ohai "hub fork (to 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 -"
else
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
safe_system "git", "commit", "--no-edit", "--verbose",
@@ -159,6 +160,7 @@ module Homebrew
safe_system "git", "push", "--set-upstream", remote, "#{branch}:#{branch}"
safe_system "hub", "pull-request", "--browse", "-m",
"#{formula.name} #{new_formula_version}#{devel_message}\n\nCreated with `brew bump-formula-pr`."
+ safe_system "git", "checkout", "-"
end
end
end