Commit ece24ef7 by nulltoken

remote: Don't parse missing urls as empty strings

parent 44bc0c6a
...@@ -308,7 +308,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) ...@@ -308,7 +308,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
if ((error = get_optional_config(config, &buf, NULL, (void *)&val)) < 0) if ((error = get_optional_config(config, &buf, NULL, (void *)&val)) < 0)
goto cleanup; goto cleanup;
if (val) { if (val && strlen(val) > 0) {
remote->pushurl = git__strdup(val); remote->pushurl = git__strdup(val);
GITERR_CHECK_ALLOC(remote->pushurl); GITERR_CHECK_ALLOC(remote->pushurl);
} }
......
...@@ -367,8 +367,14 @@ void test_network_remote_remotes__can_load_with_an_empty_url(void) ...@@ -367,8 +367,14 @@ void test_network_remote_remotes__can_load_with_an_empty_url(void)
cl_git_pass(git_remote_load(&remote, _repo, "empty-remote-url")); cl_git_pass(git_remote_load(&remote, _repo, "empty-remote-url"));
cl_assert(remote->url == NULL);
cl_assert(remote->pushurl == NULL);
cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH)); cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH));
cl_assert(giterr_last() != NULL);
cl_assert(giterr_last()->klass == GITERR_INVALID);
git_remote_free(remote); git_remote_free(remote);
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
url = git://github.com/libgit2/libgit2 url = git://github.com/libgit2/libgit2
[remote "empty-remote-url"] [remote "empty-remote-url"]
url = url =
pushurl =
[remote "test_with_pushurl"] [remote "test_with_pushurl"]
url = git://github.com/libgit2/fetchlibgit2 url = git://github.com/libgit2/fetchlibgit2
pushurl = git://github.com/libgit2/pushlibgit2 pushurl = git://github.com/libgit2/pushlibgit2
......
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