Merge pull request #13483 from MikeMcQuaid/revert-brew-ssh

Remove HOMEBREW_FORCE_BREWED_SSH

Library/Homebrew/brew.sh

@@ -396,22 +396,8 @@ setup_git() {
   fi
 }
 
-setup_ssh() {
-  # This is set by the user environment.
-  # shellcheck disable=SC2154
-  HOMEBREW_BREWED_SSH_PATH="${HOMEBREW_PREFIX}/opt/openssh/bin/ssh"
-  if [[ -n "${HOMEBREW_FORCE_BREWED_SSH}" && -x "${HOMEBREW_BREWED_SSH_PATH}" ]] &&
-     "${HOMEBREW_BREWED_SSH_PATH}" -V &>/dev/null
-  then
-    HOMEBREW_SSH="${HOMEBREW_BREWED_SSH_PATH}"
-  else
-    HOMEBREW_SSH="ssh"
-  fi
-}
-
 setup_curl
 setup_git
-setup_ssh
 
 HOMEBREW_VERSION="$("${HOMEBREW_GIT}" -C "${HOMEBREW_REPOSITORY}" describe --tags --dirty --abbrev=7 2>/dev/null)"
 HOMEBREW_USER_AGENT_VERSION="${HOMEBREW_VERSION}"
@@ -809,9 +795,7 @@ setup-analytics
 # Use this configuration file instead of ~/.ssh/config when fetching git over SSH.
 if [[ -n "${HOMEBREW_SSH_CONFIG_PATH}" ]]
 then
-  export GIT_SSH_COMMAND="${HOMEBREW_SSH} -F${HOMEBREW_SSH_CONFIG_PATH}"
-else
-  export GIT_SSH_COMMAND="${HOMEBREW_SSH}"
+  export GIT_SSH_COMMAND="ssh -F${HOMEBREW_SSH_CONFIG_PATH}"
 fi
 
 if [[ -n "${HOMEBREW_DOCKER_REGISTRY_TOKEN}" ]]

Library/Homebrew/env_config.rb

@@ -170,10 +170,6 @@ module Homebrew
                      "Automatically set if the system version of `git` is too old.",
         boolean:     true,
       },
-      HOMEBREW_FORCE_BREWED_SSH:                 {
-        description: "If set, always use a Homebrew-installed `ssh`(1) rather than the system version. ",
-        boolean:     true,
-      },
       HOMEBREW_FORCE_VENDOR_RUBY:                {
         description: "If set, always use Homebrew's vendored, relocatable Ruby version even if the system version " \
                      "of Ruby is new enough.",

docs/Manpage.md

@@ -2058,9 +2058,6 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just
 - `HOMEBREW_FORCE_BREWED_GIT`
   <br>If set, always use a Homebrew-installed `git`(1) rather than the system version. Automatically set if the system version of `git` is too old.
 
-- `HOMEBREW_FORCE_BREWED_SSH`
-  <br>If set, always use a Homebrew-installed `ssh`(1) rather than the system version. 
-
 - `HOMEBREW_FORCE_VENDOR_RUBY`
   <br>If set, always use Homebrew's vendored, relocatable Ruby version even if the system version of Ruby is new enough.
 

manpages/brew.1

@@ -2967,12 +2967,6 @@ If set, always use a Homebrew\-installed \fBcurl\fR(1) rather than the system ve
 If set, always use a Homebrew\-installed \fBgit\fR(1) rather than the system version\. Automatically set if the system version of \fBgit\fR is too old\.
 .
 .TP
-\fBHOMEBREW_FORCE_BREWED_SSH\fR
-.
-.br
-If set, always use a Homebrew\-installed \fBssh\fR(1) rather than the system version\.
-.
-.TP
 \fBHOMEBREW_FORCE_VENDOR_RUBY\fR
 .
 .br