Merge remote-tracking branch 'jamill/transport_localpaths' into development
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
diff --git a/src/transport.c b/src/transport.c
index 9c88d98..b69072f 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -53,15 +53,32 @@ static int transport_find_fn(const char *url, git_transport_cb *callback, void *
definition = definition_iter;
}
- if (!definition) {
- /* still here? Check to see if the path points to a file on the local file system */
- if ((git_path_exists(url) == 0) && git_path_isdir(url))
- definition = &local_transport_definition;
-
- /* It could be a SSH remote path. Check to see if there's a : */
- if (strrchr(url, ':'))
- definition = &dummy_transport_definition; /* SSH is an unsupported transport mechanism in this version of libgit2 */
- }
+#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
+ * to a directory and if so assume local path, else assume SSH */
+
+ /* Check to see if the path points to a file on the local file system */
+ if (!definition && git_path_exists(url) && git_path_isdir(url))
+ definition = &local_transport_definition;
+
+ /* 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, ':'))
+ definition = &dummy_transport_definition;
+#else
+ /* For other systems, perform the SSH check first, to avoid going to the
+ * filesystem if it is not necessary */
+
+ /* 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, ':'))
+ definition = &dummy_transport_definition;
+
+ /* Check to see if the path points to a file on the local file system */
+ if (!definition && git_path_exists(url) && git_path_isdir(url))
+ definition = &local_transport_definition;
+#endif
if (!definition)
return -1;
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index fbebe54..8432708 100644
--- a/tests-clar/clone/nonetwork.c
+++ b/tests-clar/clone/nonetwork.c
@@ -39,6 +39,14 @@ void test_clone_nonetwork__local(void)
cl_git_pass(git_clone(&g_repo, src, "./local", NULL, NULL, NULL));
}
+void test_clone_nonetwork__local_absolute_path(void)
+{
+ const char *src = cl_fixture("testrepo.git");
+ cl_set_cleanup(&cleanup_repository, "./local");
+
+ cl_git_pass(git_clone(&g_repo, src, "./local", NULL, NULL, NULL));
+}
+
void test_clone_nonetwork__local_bare(void)
{
const char *src = cl_git_fixture_url("testrepo.git");