Merge branch 'gb/filter-branch-progress'

diff --git a/connect.c b/connect.c
index acd39d70c8781d837bce45317d6b9641a522f85f..ced4961398d397e0e21661ce7105be293c3585c2 100644 (file)
--- 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.
                 */
@@ -730,6 +733,7 @@ struct child_process *git_connect(int fd[2], const char *url,
                        int putty = 0, tortoiseplink = 0;
                        char *ssh_host = hostandport;
                        const char *port = NULL;
+                       transport_check_allowed("ssh");
                        get_host_and_port(&ssh_host, &port);
 
                        if (!port)
@@ -785,6 +789,8 @@ struct child_process *git_connect(int fd[2], const char *url,
                                argv_array_push(&conn->args, port);
                        }
                        argv_array_push(&conn->args, ssh_host);
+               } else {
+                       transport_check_allowed("file");
                }
                argv_array_push(&conn->args, cmd.buf);