From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Aug 2017 19:27:31 +0000 (-0700)
Subject: Merge tag 'v2.12.4' into maint
X-Git-Tag: v2.13.5~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e312af164c12052b7a0dbf8f7b86549a3c5b578f?ds=inline;hp=--cc

Merge tag 'v2.12.4' into maint
---

e312af164c12052b7a0dbf8f7b86549a3c5b578f
diff --cc connect.c
index c72b1d1151,ea316c485a..e43df44b0c
--- a/connect.c
+++ b/connect.c
@@@ -856,11 -799,14 +864,14 @@@ struct child_process *git_connect(int f
  				return NULL;
  			}
  
+ 			if (looks_like_command_line_option(ssh_host))
+ 				die("strange hostname '%s' blocked", ssh_host);
+ 
  			ssh = get_ssh_command();
 -			if (!ssh) {
 -				const char *base;
 -				char *ssh_dup;
 -
 +			if (ssh)
 +				handle_ssh_variant(ssh, 1, &port_option,
 +						   &needs_batch);
 +			else {
  				/*
  				 * GIT_SSH is the no-shell version of
  				 * GIT_SSH_COMMAND (and must remain so for