diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-09-29 00:28:26 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-29 00:28:31 +0200 |
commit | 6343e2f6f271cf344ea8e7384342502faecaf37c (patch) | |
tree | 50abed20e4b930022a24b64389915f7c774acef9 /connect.c | |
parent | Git 2.4.9 (diff) | |
parent | Git 2.3.10 (diff) | |
download | git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.xz git-6343e2f6f271cf344ea8e7384342502faecaf37c.zip |
Sync with 2.3.10
Diffstat (limited to 'connect.c')
-rw-r--r-- | connect.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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, tortoiseplink = 0; char *ssh_host = hostandport; const char *port = NULL; + transport_check_allowed("ssh"); get_host_and_port(&ssh_host, &port); if (!port) @@ -781,6 +785,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); |