Merge pull request #2052 from arthurschreiber/arthur/add-git_remote_dup Fix git_remote_dup & add missing const
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 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
diff --git a/include/git2/remote.h b/include/git2/remote.h
index d3e6caa..eba6ca7 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -117,7 +117,7 @@ GIT_EXTERN(int) git_remote_save(const git_remote *remote);
* @param source object to copy
* @return 0 or an error code
*/
-GIT_EXTERN(int) git_remote_dup(git_remote **dest, const git_remote *source);
+GIT_EXTERN(int) git_remote_dup(git_remote **dest, git_remote *source);
/**
* Get the remote's repository
@@ -194,7 +194,7 @@ GIT_EXTERN(int) git_remote_add_fetch(git_remote *remote, const char *refspec);
* @param array pointer to the array in which to store the strings
* @param remote the remote to query
*/
-GIT_EXTERN(int) git_remote_get_fetch_refspecs(git_strarray *array, git_remote *remote);
+GIT_EXTERN(int) git_remote_get_fetch_refspecs(git_strarray *array, const git_remote *remote);
/**
* Set the remote's list of fetch refspecs
@@ -227,7 +227,7 @@ GIT_EXTERN(int) git_remote_add_push(git_remote *remote, const char *refspec);
* @param array pointer to the array in which to store the strings
* @param remote the remote to query
*/
-GIT_EXTERN(int) git_remote_get_push_refspecs(git_strarray *array, git_remote *remote);
+GIT_EXTERN(int) git_remote_get_push_refspecs(git_strarray *array, const git_remote *remote);
/**
* Set the remote's list of push refspecs
@@ -254,7 +254,7 @@ GIT_EXTERN(void) git_remote_clear_refspecs(git_remote *remote);
* @param remote the remote
* @return the amount of refspecs configured in this remote
*/
-GIT_EXTERN(size_t) git_remote_refspec_count(git_remote *remote);
+GIT_EXTERN(size_t) git_remote_refspec_count(const git_remote *remote);
/**
* Get a refspec from the remote
@@ -263,7 +263,7 @@ GIT_EXTERN(size_t) git_remote_refspec_count(git_remote *remote);
* @param n the refspec to get
* @return the nth refspec
*/
-GIT_EXTERN(const git_refspec *)git_remote_get_refspec(git_remote *remote, size_t n);
+GIT_EXTERN(const git_refspec *)git_remote_get_refspec(const git_remote *remote, size_t n);
/**
* Open a connection to a remote
@@ -319,7 +319,7 @@ GIT_EXTERN(int) git_remote_download(git_remote *remote);
* @param remote the remote
* @return 1 if it's connected, 0 otherwise.
*/
-GIT_EXTERN(int) git_remote_connected(git_remote *remote);
+GIT_EXTERN(int) git_remote_connected(const git_remote *remote);
/**
* Cancel the operation
@@ -510,7 +510,7 @@ typedef enum {
* @param remote the remote to query
* @return the auto-follow setting
*/
-GIT_EXTERN(git_remote_autotag_option_t) git_remote_autotag(git_remote *remote);
+GIT_EXTERN(git_remote_autotag_option_t) git_remote_autotag(const git_remote *remote);
/**
* Set the tag auto-follow setting
diff --git a/src/remote.c b/src/remote.c
index 306cb0b..5b3656a 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -248,9 +248,10 @@ int git_remote_create_inmemory(git_remote **out, git_repository *repo, const cha
return 0;
}
-int git_remote_dup(git_remote **dest, const git_remote *source)
+int git_remote_dup(git_remote **dest, git_remote *source)
{
- int error;
+ int error = 0;
+ git_strarray refspecs = { 0 };
git_remote *remote = git__calloc(1, sizeof(git_remote));
GITERR_CHECK_ALLOC(remote);
@@ -274,16 +275,33 @@ int git_remote_dup(git_remote **dest, const git_remote *source)
remote->check_cert = source->check_cert;
remote->update_fetchhead = source->update_fetchhead;
- if ((error = git_vector_dup(&remote->refs, &source->refs, NULL)) < 0 ||
- (error = git_vector_dup(&remote->refspecs, &source->refspecs, NULL)) < 0 ||
- (error = git_vector_dup(&remote->active_refspecs, &source->active_refspecs, NULL))) {
- git__free(remote);
- return error;
+ if (git_vector_init(&remote->refs, 32, NULL) < 0 ||
+ git_vector_init(&remote->refspecs, 2, NULL) < 0 ||
+ git_vector_init(&remote->active_refspecs, 2, NULL) < 0) {
+ error = -1;
+ goto cleanup;
}
+ if ((error = git_remote_get_fetch_refspecs(&refspecs, source)) < 0 ||
+ (error = git_remote_set_fetch_refspecs(remote, &refspecs)) < 0)
+ goto cleanup;
+
+ git_strarray_free(&refspecs);
+
+ if ((error = git_remote_get_push_refspecs(&refspecs, source)) < 0 ||
+ (error = git_remote_set_push_refspecs(remote, &refspecs)) < 0)
+ goto cleanup;
+
*dest = remote;
- return 0;
+cleanup:
+
+ git_strarray_free(&refspecs);
+
+ if (error < 0)
+ git__free(remote);
+
+ return error;
}
struct refspec_cb_data {
@@ -1089,7 +1107,7 @@ out:
return error;
}
-int git_remote_connected(git_remote *remote)
+int git_remote_connected(const git_remote *remote)
{
assert(remote);
@@ -1233,7 +1251,7 @@ const git_transfer_progress* git_remote_stats(git_remote *remote)
return &remote->stats;
}
-git_remote_autotag_option_t git_remote_autotag(git_remote *remote)
+git_remote_autotag_option_t git_remote_autotag(const git_remote *remote)
{
return remote->download_tags;
}
@@ -1626,7 +1644,7 @@ int git_remote_set_push_refspecs(git_remote *remote, git_strarray *array)
return set_refspecs(remote, array, true);
}
-static int copy_refspecs(git_strarray *array, git_remote *remote, unsigned int push)
+static int copy_refspecs(git_strarray *array, const git_remote *remote, unsigned int push)
{
size_t i;
git_vector refspecs;
@@ -1660,22 +1678,22 @@ on_error:
return -1;
}
-int git_remote_get_fetch_refspecs(git_strarray *array, git_remote *remote)
+int git_remote_get_fetch_refspecs(git_strarray *array, const git_remote *remote)
{
return copy_refspecs(array, remote, false);
}
-int git_remote_get_push_refspecs(git_strarray *array, git_remote *remote)
+int git_remote_get_push_refspecs(git_strarray *array, const git_remote *remote)
{
return copy_refspecs(array, remote, true);
}
-size_t git_remote_refspec_count(git_remote *remote)
+size_t git_remote_refspec_count(const git_remote *remote)
{
return remote->refspecs.length;
}
-const git_refspec *git_remote_get_refspec(git_remote *remote, size_t n)
+const git_refspec *git_remote_get_refspec(const git_remote *remote, size_t n)
{
return git_vector_get(&remote->refspecs, n);
}
diff --git a/tests/network/remote/remotes.c b/tests/network/remote/remotes.c
index 235a102..44a98d3 100644
--- a/tests/network/remote/remotes.c
+++ b/tests/network/remote/remotes.c
@@ -148,6 +148,8 @@ void test_network_remote_remotes__dup(void)
cl_git_pass(git_remote_get_push_refspecs(&array, _remote));
cl_assert_equal_i(0, (int)array.count);
git_strarray_free(&array);
+
+ git_remote_free(dup);
}
void test_network_remote_remotes__add_pushspec(void)