From 9fb1876101a1abac8e3bfcc9f4f6fadbf0921c7c Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 22 Feb 2020 21:02:23 +0100 Subject: [PATCH 1/2] pull: use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX --- Library/Homebrew/dev-cmd/pull.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index 93505328e5..58147f905e 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -287,7 +287,10 @@ module Homebrew pr_number = url[%r{/pull\/([0-9]+)}, 1] 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. + 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 end From 59747144539a3c394b6c4e5e27948df41bec22d2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 24 Feb 2020 11:41:29 +0000 Subject: [PATCH 2/2] pull: add more docs comment context. --- Library/Homebrew/dev-cmd/pull.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index 58147f905e..734131b256 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -289,6 +289,7 @@ module Homebrew # 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