From e158b5e4b1f9586a38b6bd8231fbe978f90e2713 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sun, 3 Apr 2016 21:22:39 +0800 Subject: [PATCH] pull: fix --legacy for legacy-homebrew repo --- Library/Homebrew/cmd/pull.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 06b7639bb7..33868d8f77 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -56,10 +56,12 @@ module Homebrew elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX) _, user, repo, issue = *api_match url = "https://github.com/#{user}/#{repo}/pull/#{issue}" - tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") || ARGV.include?("--legacy") + tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") + tap = CoreTap.instance if ARGV.include?("--legacy") elsif (url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX) url, user, repo, issue = *url_match - tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") || ARGV.include?("--legacy") + tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") + tap = CoreTap.instance if ARGV.include?("--legacy") else odie "Not a GitHub pull request or commit: #{arg}" end @@ -68,10 +70,6 @@ module Homebrew odie "No pull request detected!" end - if ARGV.include?("--legacy") && !tap.core_tap? - odie "--legacy can only be used for CoreTap!" - end - if tap tap.install unless tap.installed? Dir.chdir tap.path