New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / network / remote / rename.c

diff --git a/tests/network/remote/rename.c b/tests/network/remote/rename.c
index 1dabd07f59f1cbbdc6ee3c4d78154e0b69f38dfa..1fd2affba79a08a7520b80b7be902b77a44a1708 100644 (file)
--- a/tests/network/remote/rename.c
+++ b/tests/network/remote/rename.c
@@ -16,16 +16,6 @@ void test_network_remote_rename__cleanup(void)
        cl_git_sandbox_cleanup();
 }
 
-static int dont_call_me_cb(const char *fetch_refspec, void *payload)
-{
-       GIT_UNUSED(fetch_refspec);
-       GIT_UNUSED(payload);
-
-       cl_assert(false);
-
-       return -1;
-}
-
 void test_network_remote_rename__renaming_a_remote_moves_related_configuration_section(void)
 {
        git_strarray problems = {0};
@@ -35,7 +25,7 @@ void test_network_remote_rename__renaming_a_remote_moves_related_configuration_s
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        assert_config_entry_existence(_repo, "remote.test.fetch", false);
        assert_config_entry_existence(_repo, "remote.just/renamed.fetch", true);
@@ -49,7 +39,7 @@ void test_network_remote_rename__renaming_a_remote_updates_branch_related_config
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        assert_config_entry_value(_repo, "branch.master.remote", "just/renamed");
 }
@@ -60,7 +50,7 @@ void test_network_remote_rename__renaming_a_remote_updates_default_fetchrefspec(
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        assert_config_entry_value(_repo, "remote.just/renamed.fetch", "+refs/heads/*:refs/remotes/just/renamed/*");
 }
@@ -81,7 +71,7 @@ void test_network_remote_rename__renaming_a_remote_without_a_fetchrefspec_doesnt
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        assert_config_entry_existence(_repo, "remote.just/renamed.fetch", false);
 }
@@ -100,11 +90,11 @@ void test_network_remote_rename__renaming_a_remote_notifies_of_non_default_fetch
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(1, problems.count);
        cl_assert_equal_s("+refs/*:refs/*", problems.strings[0]);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        assert_config_entry_value(_repo, "remote.just/renamed.fetch", "+refs/*:refs/*");
 
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 }
 
 void test_network_remote_rename__new_name_can_contain_dots(void)
@@ -113,7 +103,7 @@ void test_network_remote_rename__new_name_can_contain_dots(void)
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just.renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
        assert_config_entry_existence(_repo, "remote.just.renamed.fetch", true);
 }
 
@@ -136,7 +126,7 @@ void test_network_remote_rename__renamed_name_is_persisted(void)
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        cl_git_pass(git_repository_open(&another_repo, "testrepo.git"));
        cl_git_pass(git_remote_lookup(&renamed, _repo, "just/renamed"));
@@ -164,7 +154,7 @@ void test_network_remote_rename__renaming_a_remote_moves_the_underlying_referenc
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&underlying, _repo, "refs/remotes/test/master"));
        cl_git_pass(git_reference_lookup(&underlying, _repo, "refs/remotes/just/renamed/master"));
@@ -181,12 +171,12 @@ void test_network_remote_rename__overwrite_ref_in_target(void)
        git_strarray problems = {0};
 
        cl_git_pass(git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"));
-       cl_git_pass(git_reference_create(&ref, _repo, "refs/remotes/renamed/master", &id, 1, NULL, NULL));
+       cl_git_pass(git_reference_create(&ref, _repo, "refs/remotes/renamed/master", &id, 1, NULL));
        git_reference_free(ref);
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        /* make sure there's only one remote-tracking branch */
        cl_git_pass(git_branch_iterator_new(&iter, _repo, GIT_BRANCH_REMOTE));
@@ -219,12 +209,12 @@ void test_network_remote_rename__symref_head(void)
        char idstr[GIT_OID_HEXSZ + 1] = {0};
        git_vector refs;
 
-       cl_git_pass(git_reference_symbolic_create(&ref, _repo, "refs/remotes/test/HEAD", "refs/remotes/test/master", 0, NULL, NULL));
+       cl_git_pass(git_reference_symbolic_create(&ref, _repo, "refs/remotes/test/HEAD", "refs/remotes/test/master", 0, NULL));
        git_reference_free(ref);
 
        cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "renamed"));
        cl_assert_equal_i(0, problems.count);
-       git_strarray_free(&problems);
+       git_strarray_dispose(&problems);
 
        cl_git_pass(git_vector_init(&refs, 2, (git_vector_cmp) git_reference_cmp));
        cl_git_pass(git_branch_iterator_new(&iter, _repo, GIT_BRANCH_REMOTE));