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

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

Browse Source
This commit is contained in:
Xu Cheng 2016-04-03 11:46:21 +08:00
parent ade39af247
commit df5bd0b796
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/pull.rb
View File

@ -307,7 +307,7 @@ module Homebrew
# Fall back to three-way merge if patch does not apply cleanly # Fall back to three-way merge if patch does not apply cleanly
patch_args << "-3" 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 patch_args << patchpath
start_revision = `git rev-parse HEAD`.strip start_revision = `git rev-parse HEAD`.strip