Move `url` to last place in parameter list
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 103 104 105 106 107 108 109 110
diff --git a/examples/network/fetch.c b/examples/network/fetch.c
index 2de5816..437b137 100644
--- a/examples/network/fetch.c
+++ b/examples/network/fetch.c
@@ -76,7 +76,7 @@ int fetch(git_repository *repo, int argc, char **argv)
// Figure out whether it's a named remote or a URL
printf("Fetching %s for repo %p\n", argv[1], repo);
if (git_remote_load(&remote, repo, argv[1]) < 0) {
- if (git_remote_create_inmemory(&remote, repo, argv[1], NULL) < 0)
+ if (git_remote_create_inmemory(&remote, repo, NULL, argv[1]) < 0)
return -1;
}
diff --git a/examples/network/ls-remote.c b/examples/network/ls-remote.c
index a3eb015..737eeac 100644
--- a/examples/network/ls-remote.c
+++ b/examples/network/ls-remote.c
@@ -21,7 +21,7 @@ static 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_create_inmemory(&remote, repo, url, NULL);
+ error = git_remote_create_inmemory(&remote, repo, NULL, url);
if (error < 0)
goto cleanup;
diff --git a/include/git2/remote.h b/include/git2/remote.h
index 29bda79..5f6a780 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -61,15 +61,15 @@ GIT_EXTERN(int) git_remote_create(
*
* @param out pointer to the new remote object
* @param repo the associated repository. May be NULL for a "dangling" remote.
- * @param url the remote repository's URL
* @param fetch the fetch refspec to use for this remote. May be NULL for defaults.
+ * @param url the remote repository's URL
* @return 0 or an error code
*/
GIT_EXTERN(int) git_remote_create_inmemory(
git_remote **out,
git_repository *repo,
- const char *url,
- const char *fetch);
+ const char *fetch,
+ const char *url);
/**
* Sets the owning repository for the remote. This is only allowed on
diff --git a/src/remote.c b/src/remote.c
index d874d60..a2e6e68 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -183,7 +183,7 @@ on_error:
return -1;
}
-int git_remote_create_inmemory(git_remote **out, git_repository *repo, const char *url, const char *fetch)
+int git_remote_create_inmemory(git_remote **out, git_repository *repo, const char *fetch, const char *url)
{
int error;
git_remote *remote;
diff --git a/tests-clar/network/remotelocal.c b/tests-clar/network/remotelocal.c
index 01492ac..5d6a16a 100644
--- a/tests-clar/network/remotelocal.c
+++ b/tests-clar/network/remotelocal.c
@@ -50,7 +50,7 @@ static void connect_to_local_repository(const char *local_repository)
{
git_buf_sets(&file_path_buf, cl_git_path_url(local_repository));
- cl_git_pass(git_remote_create_inmemory(&remote, repo, git_buf_cstr(&file_path_buf), NULL));
+ cl_git_pass(git_remote_create_inmemory(&remote, repo, NULL, git_buf_cstr(&file_path_buf)));
cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH));
}
diff --git a/tests-clar/network/remoterename.c b/tests-clar/network/remoterename.c
index 90c464e..24cfadc 100644
--- a/tests-clar/network/remoterename.c
+++ b/tests-clar/network/remoterename.c
@@ -167,7 +167,7 @@ void test_network_remoterename__cannot_rename_an_inmemory_remote(void)
{
git_remote *remote;
- cl_git_pass(git_remote_create_inmemory(&remote, _repo, "file:///blah", NULL));
+ cl_git_pass(git_remote_create_inmemory(&remote, _repo, NULL, "file:///blah"));
cl_git_fail(git_remote_rename(remote, "newname", NULL, NULL));
git_remote_free(remote);
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c
index a758c0b..e947ffe 100644
--- a/tests-clar/network/remotes.c
+++ b/tests-clar/network/remotes.c
@@ -255,7 +255,7 @@ void test_network_remotes__cannot_save_an_inmemory_remote(void)
{
git_remote *remote;
- cl_git_pass(git_remote_create_inmemory(&remote, _repo, "git://github.com/libgit2/libgit2", NULL));
+ cl_git_pass(git_remote_create_inmemory(&remote, _repo, NULL, "git://github.com/libgit2/libgit2"));
cl_assert_equal_p(NULL, git_remote_name(remote));
@@ -318,7 +318,7 @@ void test_network_remotes__check_structure_version(void)
git_remote_free(_remote);
_remote = NULL;
- cl_git_pass(git_remote_create_inmemory(&_remote, _repo, "test-protocol://localhost", NULL));
+ cl_git_pass(git_remote_create_inmemory(&_remote, _repo, NULL, "test-protocol://localhost"));
transport.version = 0;
cl_git_fail(git_remote_set_transport(_remote, &transport));