From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Sep 2015 22:28:26 +0000 (-0700)
Subject: Sync with 2.3.10
X-Git-Tag: v2.4.10~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6343e2f6f271cf344ea8e7384342502faecaf37c;p=thirdparty%2Fgit.git

Sync with 2.3.10
---

6343e2f6f271cf344ea8e7384342502faecaf37c
diff --cc Documentation/git.txt
index 97d9fb41b2,c06b923969..5826bd9771
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,23 -43,10 +43,24 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.4.9/git.html[documentation for release 2.4.9]
 +
 +* release notes for
 +  link:RelNotes/2.4.9.txt[2.4.9],
 +  link:RelNotes/2.4.8.txt[2.4.8],
 +  link:RelNotes/2.4.7.txt[2.4.7],
 +  link:RelNotes/2.4.6.txt[2.4.6],
 +  link:RelNotes/2.4.5.txt[2.4.5],
 +  link:RelNotes/2.4.4.txt[2.4.4],
 +  link:RelNotes/2.4.3.txt[2.4.3],
 +  link:RelNotes/2.4.2.txt[2.4.2],
 +  link:RelNotes/2.4.1.txt[2.4.1],
 +  link:RelNotes/2.4.0.txt[2.4].
 +
- * link:v2.3.9/git.html[documentation for release 2.3.9]
+ * link:v2.3.10/git.html[documentation for release 2.3.10]
  
  * release notes for
+   link:RelNotes/2.3.10.txt[2.3.10],
    link:RelNotes/2.3.9.txt[2.3.9],
    link:RelNotes/2.3.8.txt[2.3.8],
    link:RelNotes/2.3.7.txt[2.3.7],
diff --cc connect.c
index c0144d859a,bd4b50ea15..27a706f766
--- a/connect.c
+++ b/connect.c
@@@ -724,9 -727,10 +727,10 @@@ struct child_process *git_connect(int f
  		conn->in = conn->out = -1;
  		if (protocol == PROTO_SSH) {
  			const char *ssh;
 -			int putty;
 +			int putty, tortoiseplink = 0;
  			char *ssh_host = hostandport;
  			const char *port = NULL;
+ 			transport_check_allowed("ssh");
  			get_host_and_port(&ssh_host, &port);
  
  			if (!port)
diff --cc http.c
index 9a7e0892e4,00e3fc80e8..9448c50f0f
--- a/http.c
+++ b/http.c
@@@ -8,7 -8,7 +8,8 @@@
  #include "credential.h"
  #include "version.h"
  #include "pkt-line.h"
 +#include "gettext.h"
+ #include "transport.h"
  
  int active_requests;
  int http_is_verbose;