From 3b3da02cf35103d490459508aaa827b7995aa0c6 Mon Sep 17 00:00:00 2001 From: Martin Afanasjew Date: Mon, 20 Jun 2016 17:40:54 +0200 Subject: [PATCH] boneyard-formula-pr: fix local branch creation In local-only mode, the created branches end up tracking `origin/master` which isn't desirable. --- Library/Homebrew/dev-cmd/boneyard-formula-pr.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/boneyard-formula-pr.rb b/Library/Homebrew/dev-cmd/boneyard-formula-pr.rb index 2a9baf5c9f..f415117007 100644 --- a/Library/Homebrew/dev-cmd/boneyard-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/boneyard-formula-pr.rb @@ -70,7 +70,7 @@ module Homebrew branch = "#{formula.name}-boneyard" if ARGV.dry_run? 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}" unless local_only @@ -82,7 +82,7 @@ module Homebrew end else 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", "--message=#{formula.name}: migrate to boneyard", "--", formula_relpath, tap_migrations_path.basename @@ -104,7 +104,7 @@ module Homebrew if ARGV.dry_run? puts "cd #{boneyard_tap.path}" - puts "git checkout -b #{branch} origin/master" + puts "git checkout --no-track -b #{branch} origin/master" if bottle_block puts "Removing bottle block" else @@ -122,7 +122,7 @@ module Homebrew end else 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 Utils::Inreplace.inreplace formula_file, / bottle do.+?end\n\n/m, "" end