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

pull: check bottle commit URL before branching.

Browse Source 
Otherwise we annoyingly end up on a branch unnecessarily.
This commit is contained in:
Mike McQuaid 2015-02-19 10:55:42 +00:00
parent 40e6426322
commit 258c4ddefe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/pull.rb
View File

@ -141,13 +141,16 @@ module Homebrew
end
if ARGV.include? "--bottle"
bottle_commit_url = if tap_name
"https://github.com/BrewTestBot/homebrew-#{tap_name}/compare/homebrew:master...pr-#{issue}"
else
"https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
end
curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
bottle_branch = "pull-bottle-#{issue}"
safe_system "git", "checkout", "-B", bottle_branch, revision
if tap_name
pull_url "https://github.com/BrewTestBot/homebrew-#{tap_name}/compare/homebrew:master...pr-#{issue}"
else
pull_url "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
end
pull_url bottle_commit_url
safe_system "git", "rebase", branch
safe_system "git", "checkout", branch
safe_system "git", "merge", "--ff-only", "--no-edit", bottle_branch