diff options
Diffstat (limited to 'tests/libgit2')
-rw-r--r-- | tests/libgit2/network/fetchlocal.c | 6 | ||||
-rw-r--r-- | tests/libgit2/online/clone.c | 4 | ||||
-rw-r--r-- | tests/libgit2/online/fetch.c | 8 | ||||
-rw-r--r-- | tests/libgit2/online/push_util.c | 4 | ||||
-rw-r--r-- | tests/libgit2/online/push_util.h | 2 | ||||
-rw-r--r-- | tests/libgit2/submodule/update.c | 3 |
6 files changed, 18 insertions, 9 deletions
diff --git a/tests/libgit2/network/fetchlocal.c b/tests/libgit2/network/fetchlocal.c index dc37c38ab..f45ba8a4a 100644 --- a/tests/libgit2/network/fetchlocal.c +++ b/tests/libgit2/network/fetchlocal.c @@ -108,11 +108,12 @@ void test_network_fetchlocal__prune(void) git_repository_free(repo); } -static int update_tips_fail_on_call(const char *ref, const git_oid *old, const git_oid *new, void *data) +static int update_tips_fail_on_call(const char *ref, const git_oid *old, const git_oid *new, git_refspec *refspec, void *data) { GIT_UNUSED(ref); GIT_UNUSED(old); GIT_UNUSED(new); + GIT_UNUSED(refspec); GIT_UNUSED(data); cl_fail("update tips called"); @@ -510,13 +511,14 @@ void test_network_fetchlocal__prune_load_fetch_prune_config(void) git_repository_free(repo); } -static int update_tips_error(const char *ref, const git_oid *old, const git_oid *new, void *data) +static int update_tips_error(const char *ref, const git_oid *old, const git_oid *new, git_refspec *refspec, void *data) { int *callcount = (int *) data; GIT_UNUSED(ref); GIT_UNUSED(old); GIT_UNUSED(new); + GIT_UNUSED(refspec); (*callcount)++; diff --git a/tests/libgit2/online/clone.c b/tests/libgit2/online/clone.c index b635739b6..b97f8f514 100644 --- a/tests/libgit2/online/clone.c +++ b/tests/libgit2/online/clone.c @@ -281,10 +281,10 @@ void test_online_clone__clone_mirror(void) cl_fixture_cleanup("./foo.git"); } -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *payload) +static int update_tips(const char *refname, const git_oid *a, const git_oid *b, git_refspec *spec, void *payload) { int *callcount = (int*)payload; - GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); + GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); GIT_UNUSED(spec); *callcount = *callcount + 1; return 0; } diff --git a/tests/libgit2/online/fetch.c b/tests/libgit2/online/fetch.c index a557bbf75..8e0ed8934 100644 --- a/tests/libgit2/online/fetch.c +++ b/tests/libgit2/online/fetch.c @@ -39,9 +39,13 @@ void test_online_fetch__cleanup(void) git__free(_remote_redirect_subsequent); } -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *data) +static int update_tips(const char *refname, const git_oid *a, const git_oid *b, git_refspec *spec, void *data) { - GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); GIT_UNUSED(data); + GIT_UNUSED(refname); + GIT_UNUSED(a); + GIT_UNUSED(b); + GIT_UNUSED(spec); + GIT_UNUSED(data); ++counter; diff --git a/tests/libgit2/online/push_util.c b/tests/libgit2/online/push_util.c index 94919e9b2..f96b1d5ea 100644 --- a/tests/libgit2/online/push_util.c +++ b/tests/libgit2/online/push_util.c @@ -35,11 +35,13 @@ void record_callbacks_data_clear(record_callbacks_data *data) data->transfer_progress_calls = 0; } -int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, void *data) +int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, git_refspec *spec, void *data) { updated_tip *t; record_callbacks_data *record_data = (record_callbacks_data *)data; + GIT_UNUSED(spec); + cl_assert(t = git__calloc(1, sizeof(*t))); cl_assert(t->name = git__strdup(refname)); diff --git a/tests/libgit2/online/push_util.h b/tests/libgit2/online/push_util.h index 5f669feaf..c5a3d42a9 100644 --- a/tests/libgit2/online/push_util.h +++ b/tests/libgit2/online/push_util.h @@ -50,7 +50,7 @@ void record_callbacks_data_clear(record_callbacks_data *data); * * @param data (git_vector *) of updated_tip instances */ -int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, void *data); +int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, git_refspec *spec, void *data); /** * Create a set of refspecs that deletes each of the inputs diff --git a/tests/libgit2/submodule/update.c b/tests/libgit2/submodule/update.c index 052a4a1fe..d89eff113 100644 --- a/tests/libgit2/submodule/update.c +++ b/tests/libgit2/submodule/update.c @@ -71,13 +71,14 @@ static int checkout_notify_cb( return 0; } -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *data) +static int update_tips(const char *refname, const git_oid *a, const git_oid *b, git_refspec *spec, void *data) { struct update_submodule_cb_payload *update_payload = data; GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); + GIT_UNUSED(spec); update_payload->update_tips_called = 1; |