Commit a68e217f5c273c5c7bc6a419c600b33747b8558a
2014-11-02T21:57:14
remote: unify the creation code The create function with default refspec is the same as the one with a custom refspec, but it has the default refspec, so we can create the one on top of the other.
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
diff --git a/src/remote.c b/src/remote.c
index 0ae377e..d346fb3 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -207,34 +207,15 @@ static int ensure_remote_doesnot_exist(git_repository *repo, const char *name)
int git_remote_create(git_remote **out, git_repository *repo, const char *name, const char *url)
{
git_buf buf = GIT_BUF_INIT;
- git_remote *remote = NULL;
int error;
- if ((error = ensure_remote_name_is_valid(name)) < 0)
- return error;
-
- if ((error = ensure_remote_doesnot_exist(repo, name)) < 0)
- return error;
-
if (git_buf_printf(&buf, "+refs/heads/*:refs/remotes/%s/*", name) < 0)
return -1;
- if (create_internal(&remote, repo, name, url, git_buf_cstr(&buf)) < 0)
- goto on_error;
-
+ error = git_remote_create_with_fetchspec(out, repo, name, url, git_buf_cstr(&buf));
git_buf_free(&buf);
- if (git_remote_save(remote) < 0)
- goto on_error;
-
- *out = remote;
-
- return 0;
-
-on_error:
- git_buf_free(&buf);
- git_remote_free(remote);
- return -1;
+ return error;
}
int git_remote_create_with_fetchspec(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch)