proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-06 20:56:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remotes: change git_remote_new's signature

Browse Source 
Add a fetch refspec arguemnt and make the arguments (name, url,
refspec), as that order makes more sense.
This commit is contained in:
Carlos Martín Nieto 2012-05-03 20:25:56 +02:00
parent a209a025c6
commit baaa8a447e
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/network/fetch.c
View File

@ -69,7 +69,7 @@ int fetch(git_repository *repo, int argc, char **argv)
// Figure out whether it's a named remote or a URL
printf("Fetching %s\n", argv[1]);
if (git_remote_load(&remote, repo, argv[1]) < 0) {
if (git_remote_new(&remote, repo, argv[1], NULL) < 0)
if (git_remote_new(&remote, repo, NULL, argv[1], NULL) < 0)
return -1;
}

2
examples/network/ls-remote.c
View File

@ -19,7 +19,7 @@ int use_unnamed(git_repository *repo, const char *url)
// Create an instance of a remote from the URL. The transport to use
// is detected from the URL
error = git_remote_new(&remote, repo, url, NULL);
error = git_remote_new(&remote, repo, NULL, url, NULL);
if (error < GIT_SUCCESS)
goto cleanup;

5
include/git2/remote.h
View File

@ -38,11 +38,12 @@ GIT_BEGIN_DECL
*
* @param out pointer to the new remote object
* @param repo the associtated repository
* @param url the remote repository's URL
* @param name the remote's name
* @param url the remote repository's URL
* @param fetch the fetch refspec to use for this remote
* @return GIT_SUCCESS or an error code
*/
GIT_EXTERN(int) git_remote_new(git_remote **out, git_repository *repo, const char *url, const char *name);
GIT_EXTERN(int) git_remote_new(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch);
/**
* Get the information for a particular remote

19
src/remote.c
View File

@ -54,7 +54,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha
return refspec_parse(refspec, val);
}
int git_remote_new(git_remote **out, git_repository *repo, const char *url, const char *name)
int git_remote_new(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch)
{
git_remote *remote;
@ -78,8 +78,17 @@ int git_remote_new(git_remote **out, git_repository *repo, const char *url, cons
GITERR_CHECK_ALLOC(remote->name);
}
if (fetch != NULL) {
if (refspec_parse(&remote->fetch, fetch) < 0)
goto on_error;
}
*out = remote;
return 0;
on_error:
git_remote_free(remote);
return -1;
}
int git_remote_load(git_remote **out, git_repository *repo, const char *name)
@ -480,19 +489,17 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo)
int git_remote_add(git_remote **out, git_repository *repo, const char *name, const char *url)
{
git_buf buf = GIT_BUF_INIT;
if (git_remote_new(out, repo, url, name) < 0)
return -1;
if (git_buf_printf(&buf, "refs/heads/*:refs/remotes/%s/*", name) < 0)
goto on_error;
return -1;
if (git_remote_set_fetchspec(*out, git_buf_cstr(&buf)) < 0)
if (git_remote_new(out, repo, name, url, git_buf_cstr(&buf)) < 0)
goto on_error;
git_buf_free(&buf);
if (git_remote_save(*out) < 0)
return -1;
goto on_error;
return 0;

2
tests-clar/network/remotelocal.c
View File

@ -85,7 +85,7 @@ static void connect_to_local_repository(const char *local_repository)
{
build_local_file_url(&file_path_buf, local_repository);
cl_git_pass(git_remote_new(&remote, repo, git_buf_cstr(&file_path_buf), NULL));
cl_git_pass(git_remote_new(&remote, repo, NULL, git_buf_cstr(&file_path_buf), NULL));
cl_git_pass(git_remote_connect(remote, GIT_DIR_FETCH));
}

2
tests-clar/network/remotes.c
View File

@ -78,7 +78,7 @@ void test_network_remotes__save(void)
git_remote_free(_remote);
/* Set up the remote and save it to config */
cl_git_pass(git_remote_new(&_remote, _repo, "git://github.com/libgit2/libgit2", "upstream"));
cl_git_pass(git_remote_new(&_remote, _repo, "upstream", "git://github.com/libgit2/libgit2", NULL));
cl_git_pass(git_remote_set_fetchspec(_remote, "refs/heads/*:refs/remotes/upstream/*"));
cl_git_pass(git_remote_set_pushspec(_remote, "refs/heads/*:refs/heads/*"));
cl_git_pass(git_remote_save(_remote));