Commit cb2ace69 by Jameson Miller

Transport resolution on Win32 should handle absolute local paths

parent ae0ddc6f
...@@ -53,15 +53,30 @@ static int transport_find_fn(const char *url, git_transport_cb *callback, void * ...@@ -53,15 +53,30 @@ static int transport_find_fn(const char *url, git_transport_cb *callback, void *
definition = definition_iter; definition = definition_iter;
} }
if (!definition) { #ifdef GIT_WIN32
/* still here? Check to see if the path points to a file on the local file system */ /* On Windows, it might not be possible to discern between absolute local
if ((git_path_exists(url) == 0) && git_path_isdir(url)) * 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; definition = &local_transport_definition;
/* It could be a SSH remote path. Check to see if there's a : */ /* It could be a SSH remote path. Check to see if there's a : */
if (strrchr(url, ':')) if (!definition && strrchr(url, ':'))
definition = &dummy_transport_definition; /* SSH is an unsupported transport mechanism in this version of libgit2 */ definition = &dummy_transport_definition; /* SSH is an unsupported transport mechanism in this version of libgit2 */
} #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 : */
if (!definition && strrchr(url, ':'))
definition = &dummy_transport_definition; /* SSH is an unsupported transport mechanism in this version of libgit2 */
/* 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) if (!definition)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment