pull: fix --legacy when pulling bottle from new repo

2016-04-03 11:46:21 +08:00 · 2016-04-03 11:46:21 +08:00 · df5bd0b796
commit df5bd0b796
parent ade39af247
1 changed files with 1 additions and 1 deletions
--- 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