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

boneyard-formula-pr: fix local branch creation

Browse Source 
In local-only mode, the created branches end up tracking `origin/master`
which isn't desirable.
This commit is contained in:
Martin Afanasjew 2016-06-20 17:40:54 +02:00
parent 69401bfe91
commit 3b3da02cf3
1 changed files with 4 additions and 4 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

@ -70,7 +70,7 @@ module Homebrew
branch = "#{formula.name}-boneyard" branch = "#{formula.name}-boneyard"
if ARGV.dry_run? if ARGV.dry_run?
puts "cd #{formula.tap.path}" puts "cd #{formula.tap.path}"
puts "git checkout -b #{branch} origin/master" puts "git checkout --no-track -b #{branch} origin/master"
puts "git commit --no-edit --verbose --message=\"#{formula.name}: migrate to boneyard\" -- #{formula_relpath} #{tap_migrations_path.basename}" puts "git commit --no-edit --verbose --message=\"#{formula.name}: migrate to boneyard\" -- #{formula_relpath} #{tap_migrations_path.basename}"
unless local_only unless local_only
@ -82,7 +82,7 @@ module Homebrew
end end
else else
cd formula.tap.path cd formula.tap.path
safe_system "git", "checkout", "-b", branch, "origin/master" safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
safe_system "git", "commit", "--no-edit", "--verbose", safe_system "git", "commit", "--no-edit", "--verbose",
"--message=#{formula.name}: migrate to boneyard", "--message=#{formula.name}: migrate to boneyard",
"--", formula_relpath, tap_migrations_path.basename "--", formula_relpath, tap_migrations_path.basename
@ -104,7 +104,7 @@ module Homebrew
if ARGV.dry_run? if ARGV.dry_run?
puts "cd #{boneyard_tap.path}" puts "cd #{boneyard_tap.path}"
puts "git checkout -b #{branch} origin/master" puts "git checkout --no-track -b #{branch} origin/master"
if bottle_block if bottle_block
puts "Removing bottle block" puts "Removing bottle block"
else else
@ -122,7 +122,7 @@ module Homebrew
end end
else else
cd boneyard_tap.formula_dir cd boneyard_tap.formula_dir
safe_system "git", "checkout", "-b", branch, "origin/master" safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
if bottle_block if bottle_block
Utils::Inreplace.inreplace formula_file, / bottle do.+?end\n\n/m, "" Utils::Inreplace.inreplace formula_file, / bottle do.+?end\n\n/m, ""
end end