diff options
| author | Xu Cheng | 2016-04-03 11:46:21 +0800 |
|---|---|---|
| committer | Xu Cheng | 2016-04-03 12:15:47 +0800 |
| commit | df5bd0b796fef6dd4df86d48a7684dd006430fbb (patch) | |
| tree | 87ff9cd21d140718ec1f10bfbf8fe21709e08d92 | |
| parent | ade39af24731c8e7ff29ebba9626b7d8e077ddce (diff) | |
| download | brew-df5bd0b796fef6dd4df86d48a7684dd006430fbb.tar.bz2 | |
pull: fix --legacy when pulling bottle from new repo
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index eefda3136..06b7639bb 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 |