Commit ba67c0752269ba06523fe7f5fa350e6328b20241
2014-08-31T17:16:40
remote: get rid of git_remote_valid_url() It does the same as git_remote_supported_url() but has a name which implies we'd check the URL for correctness while we're simply looking at the scheme and looking it up in our lists. While here, fix up the tests so we check all the combination of what's supported.
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 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
diff --git a/include/git2/remote.h b/include/git2/remote.h
index c0717fa..de5823e 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -384,15 +384,12 @@ GIT_EXTERN(int) git_remote_fetch(
const char *reflog_message);
/**
- * Return whether a string is a valid remote URL
*
- * @param url the url to check
- * @return 1 if the url is valid, 0 otherwise
- */
-GIT_EXTERN(int) git_remote_valid_url(const char *url);
-
-/**
- * Return whether the passed URL is supported by this version of the library.
+ * Return whether the library supports a particular URL scheme
+ *
+ * Both the built-in and externally-registered transport lists are
+ * searched for a transport which supports the scheme of the given
+ * URL.
*
* @param url the url to check
* @return 1 if the url is supported, 0 otherwise
diff --git a/src/transport.c b/src/transport.c
index 3295b19..d42c926 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -212,24 +212,13 @@ done:
return error;
}
-/* from remote.h */
-int git_remote_valid_url(const char *url)
-{
- git_transport_cb fn;
- void *param;
-
- return !transport_find_fn(&fn, url, ¶m);
-}
-
int git_remote_supported_url(const char* url)
{
git_transport_cb fn;
void *param;
- if (transport_find_fn(&fn, url, ¶m) < 0)
- return 0;
-
- return 1;
+ /* The only error we expect is ENOTFOUND */
+ return !transport_find_fn(&fn, url, ¶m);
}
int git_transport_init(git_transport *opts, unsigned int version)
diff --git a/tests/network/remote/remotes.c b/tests/network/remote/remotes.c
index 21c5711..1d5d318 100644
--- a/tests/network/remote/remotes.c
+++ b/tests/network/remote/remotes.c
@@ -91,25 +91,30 @@ void test_network_remote_remotes__error_when_no_push_available(void)
git_remote_free(r);
}
-void test_network_remote_remotes__parsing_ssh_remote(void)
+void test_network_remote_remotes__supported_transport_methods_are_supported(void)
{
- cl_assert( git_remote_valid_url("git@github.com:libgit2/libgit2.git") );
-}
+ cl_assert(git_remote_supported_url("git://github.com/libgit2/libgit2"));
+ cl_assert(git_remote_supported_url("http://github.com/libgit2/libgit2"));
-void test_network_remote_remotes__parsing_local_path_fails_if_path_not_found(void)
-{
- cl_assert( !git_remote_valid_url("/home/git/repos/libgit2.git") );
-}
+#ifdef GIT_SSH
+ cl_assert(git_remote_supported_url("git@github.com:libgit2/libgit2.git"));
+ cl_assert(git_remote_supported_url("ssh://git@github.com/libgit2/libgit2.git"));
+#endif
-void test_network_remote_remotes__supported_transport_methods_are_supported(void)
-{
- cl_assert( git_remote_supported_url("git://github.com/libgit2/libgit2") );
+#if defined(GIT_SSL) || defined(GIT_WINHTTP)
+ cl_assert(git_remote_supported_url("https://git@github.com/libgit2/libgit2.git"));
+#endif
}
void test_network_remote_remotes__unsupported_transport_methods_are_unsupported(void)
{
#ifndef GIT_SSH
- cl_assert( !git_remote_supported_url("git@github.com:libgit2/libgit2.git") );
+ cl_assert(!git_remote_supported_url("git@github.com:libgit2/libgit2.git"));
+ cl_assert(!git_remote_supported_url("ssh://git@github.com/libgit2/libgit2.git"));
+#endif
+
+#if !defined(GIT_SSL) && !defined(GIT_WINHTTP)
+ cl_assert(!git_remote_supported_url("https://git@github.com/libgit2/libgit2.git"));
#endif
}