summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-28 21:33:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-28 21:33:27 (GMT)
commitdf37727a65c87cf9bba35befca1255031649553f (patch)
tree1b94b1eff66ebbc258722f59b60ca64eac0c6de3 /connect.c
parentecad27cf98c391d5cfdc26ce0e442e02347baad0 (diff)
parent33cfccbbf35a56e190b79bdec5c85457c952a021 (diff)
downloadgit-df37727a65c87cf9bba35befca1255031649553f.zip
git-df37727a65c87cf9bba35befca1255031649553f.tar.gz
git-df37727a65c87cf9bba35befca1255031649553f.tar.bz2
Merge branch 'jk/transfer-limit-protocol' into maint-2.3
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/connect.c b/connect.c
index 14c924b..bd4b50e 100644
--- a/connect.c
+++ b/connect.c
@@ -9,6 +9,7 @@
#include "url.h"
#include "string-list.h"
#include "sha1-array.h"
+#include "transport.h"
static char *server_capabilities;
static const char *parse_feature_value(const char *, const char *, int *);
@@ -694,6 +695,8 @@ struct child_process *git_connect(int fd[2], const char *url,
else
target_host = xstrdup(hostandport);
+ transport_check_allowed("git");
+
/* These underlying connection commands die() if they
* cannot connect.
*/
@@ -727,6 +730,7 @@ struct child_process *git_connect(int fd[2], const char *url,
int putty;
char *ssh_host = hostandport;
const char *port = NULL;
+ transport_check_allowed("ssh");
get_host_and_port(&ssh_host, &port);
if (!port)
@@ -768,6 +772,7 @@ struct child_process *git_connect(int fd[2], const char *url,
/* remove repo-local variables from the environment */
conn->env = local_repo_env;
conn->use_shell = 1;
+ transport_check_allowed("file");
}
argv_array_push(&conn->args, cmd.buf);