From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Jul 2017 21:57:33 +0000 (-0700)
Subject: Merge tag 'v2.9.5' into maint-2.10
X-Git-Tag: v2.10.4~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d78f06a1b70f3743899b5494f55a456596e51a63

Merge tag 'v2.9.5' into maint-2.10

Git 2.9.5
---

d78f06a1b70f3743899b5494f55a456596e51a63
diff --cc connect.c
index 722dc3fc54,c75bf52ee2..048fa04917
--- a/connect.c
+++ b/connect.c
@@@ -771,7 -766,10 +779,10 @@@ 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 = getenv("GIT_SSH_COMMAND");
 +			ssh = get_ssh_command();
  			if (!ssh) {
  				const char *base;
  				char *ssh_dup;