Merge tag 'v2.12.4' into maint

diff --cc cache.h
Simple merge

diff --cc connect.c
index c72b1d1151744c5e7c7b82f453892a1bc9b26021,ea316c485ab3d0329caf6711b1f422ee298fb0b0..e43df44b0cfb6b8eaf09c662c8e631c05568a214
--- 1/connect.c
--- 2/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

diff --cc path.c
Simple merge