From df5bd0b796fef6dd4df86d48a7684dd006430fbb Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sun, 3 Apr 2016 11:46:21 +0800 Subject: [PATCH] pull: fix --legacy when pulling bottle from new repo --- Library/Homebrew/cmd/pull.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index eefda31363..06b7639bb7 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -307,7 +307,7 @@ module Homebrew # Fall back to three-way merge if patch does not apply cleanly patch_args << "-3" - patch_args << "-p2" if ARGV.include?("--legacy") + patch_args << "-p2" if ARGV.include?("--legacy") && !base_url.include?("BrewTestBot/homebrew-core") patch_args << patchpath start_revision = `git rev-parse HEAD`.strip