From 6d5f6ce96cdaeb82aa9ddb0584c6fc0efaf1c8c2 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Mon, 24 Feb 2020 22:56:33 +0000 Subject: [PATCH] Revert "pull: use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX" - This reverts commit 9fb1876101a1abac8e3bfcc9f4f6fadbf0921c7c and commit f8863c8a3bbef32dc65c9b95a57b54d7fc26c27e. - The `JENKINS_HOME` envvar appears to be unset on the Linux Jenkins master that holds the BinTray credentials. - It's bed time, we're too tired to be fixing forward! --- Library/Homebrew/dev-cmd/pull.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index a89d851390..93505328e5 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -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