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

Merge pull request #7077 from issyl0/revert-homebrew-force-hol-changes

Browse Source 
Revert "pull: use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX"
This commit is contained in:
Issy Long 2020-02-24 23:17:55 +00:00 committed by GitHub
commit a80b89c66e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,12 +287,7 @@ module Homebrew
pr_number = url[%r{/pull\/([0-9]+)}, 1]
return false unless pr_number
# 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
# Skip that on Jenkins, because upload job runs on Linux.
remote = (ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] && ENV["JENKINS_HOME"].nil?) ? "homebrew" : "origin"
safe_system "git", "fetch", "--quiet", remote, "pull/#{pr_number}/head"
safe_system "git", "fetch", "--quiet", "origin", "pull/#{pr_number}/head"
Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1
end