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

Merge pull request #7070 from dawidd6/pull-on-linux

Browse Source 
pull: use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX
This commit is contained in:
Mike McQuaid 2020-02-24 17:13:41 +00:00 committed by GitHub
commit 670227bdc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/dev-cmd/pull.rb
View File

@ -287,7 +287,11 @@ module Homebrew
pr_number = url[%r{/pull\/([0-9]+)}, 1] pr_number = url[%r{/pull\/([0-9]+)}, 1]
return false unless pr_number return false unless pr_number
safe_system "git", "fetch", "--quiet", "origin", "pull/#{pr_number}/head" # Use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX env variable is set.
# The `homebrew` remote points to homebrew-core tap and is used by Linux maintainers.
# See https://docs.brew.sh/Homebrew-linuxbrew-core-Maintainer-Guide#preparation
remote = ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] ? "homebrew" : "origin"
safe_system "git", "fetch", "--quiet", remote, "pull/#{pr_number}/head"
Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1 Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1
end end