Commit 34e510cedfdf0c45de9c77948898553778769ece
2014-07-30T01:41:43
Allow to override default ssh transport_cb W/o this patch it is not possible to have a third party ssh transport_cb if GIT_SSH is disabled or a third party transport_cb which has a higher priority than the default one. Signed-off-by: Sven Strickroth <email@cs-ware.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/transport.c b/src/transport.c
index c0311fa..d390e14 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -46,34 +46,37 @@ static git_vector custom_transports = GIT_VECTOR_INIT;
#define GIT_TRANSPORT_COUNT (sizeof(transports)/sizeof(transports[0])) - 1
-static int transport_find_fn(
- git_transport_cb *out,
- const char *url,
- void **param)
+static transport_definition * transport_find_by_url(const char *url)
{
size_t i = 0;
- transport_definition *d, *definition = NULL;
+ transport_definition *d;
/* Find a user transport who wants to deal with this URI */
git_vector_foreach(&custom_transports, i, d) {
if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
- definition = d;
- break;
+ return d;
}
}
/* Find a system transport for this URI */
- if (!definition) {
- for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) {
- d = &transports[i];
-
- if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
- definition = d;
- break;
- }
+ for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) {
+ d = &transports[i];
+
+ if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
+ return d;
}
}
+ return NULL;
+}
+
+static int transport_find_fn(
+ git_transport_cb *out,
+ const char *url,
+ void **param)
+{
+ transport_definition *definition = transport_find_by_url(url);
+
#ifdef GIT_WIN32
/* On Windows, it might not be possible to discern between absolute local
* and ssh paths - first check if this is a valid local path that points
@@ -89,12 +92,15 @@ static int transport_find_fn(
/* It could be a SSH remote path. Check to see if there's a :
* SSH is an unsupported transport mechanism in this version of libgit2 */
- if (!definition && strrchr(url, ':'))
-#ifdef GIT_SSH
- definition = &ssh_transport_definition;
-#else
- definition = &dummy_transport_definition;
+ if (!definition && strrchr(url, ':')) {
+ // re-search transports again with ssh:// as url so that we can find a third party ssh transport
+ definition = transport_find_by_url("ssh://");
+#ifndef GIT_SSH
+ if (!definition) {
+ definition = &dummy_transport_definition;
+ }
#endif
+ }
#ifndef GIT_WIN32
/* Check to see if the path points to a file on the local file system */