From 7e7720803cdf41ab46b9cac5b3fd40e9848bf135 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 13:21:10 -0800
Subject: [PATCH] Set GIT_SSH_VARIANT alongside GIT_SSH

A recent version of Git has changed some piece of behavior here and we
now get "fatal: ssh variant 'simple' does not support setting port"
when using a port. Explicitly setting GIT_SSH_VARIANT to `ssh` likely
fixes this.
---
 .../diffusion/protocol/DiffusionGitCommandEngine.php             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
index 168b18caa5..995e156d8e 100644
--- a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
@@ -27,6 +27,7 @@ final class DiffusionGitCommandEngine
     $env['HOME'] = PhabricatorEnv::getEmptyCWD();
 
     $env['GIT_SSH'] = $this->getSSHWrapper();
+    $env['GIT_SSH_VARIANT'] = 'ssh';
 
     if ($this->isAnyHTTPProtocol()) {
       $uri = $this->getURI();