Merge from 2660

This commit is contained in:
Carlos Martín Nieto 2014-10-27 01:48:37 +01:00
commit 70f7e2c6e3

View File

@ -135,6 +135,7 @@ void test_network_fetchlocal__multi_remotes(void)
git_strarray refnames = {0}; git_strarray refnames = {0};
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT; git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
cl_set_cleanup(&cleanup_sandbox, NULL);
callbacks.transfer_progress = transfer_cb; callbacks.transfer_progress = transfer_cb;
cl_git_pass(git_remote_load(&test, repo, "test")); cl_git_pass(git_remote_load(&test, repo, "test"));
cl_git_pass(git_remote_set_url(test, cl_git_fixture_url("testrepo.git"))); cl_git_pass(git_remote_set_url(test, cl_git_fixture_url("testrepo.git")));
@ -145,6 +146,7 @@ void test_network_fetchlocal__multi_remotes(void)
cl_git_pass(git_reference_list(&refnames, repo)); cl_git_pass(git_reference_list(&refnames, repo));
cl_assert_equal_i(32, (int)refnames.count); cl_assert_equal_i(32, (int)refnames.count);
git_strarray_free(&refnames);
cl_git_pass(git_remote_load(&test2, repo, "test_with_pushurl")); cl_git_pass(git_remote_load(&test2, repo, "test_with_pushurl"));
cl_git_pass(git_remote_set_url(test2, cl_git_fixture_url("testrepo.git"))); cl_git_pass(git_remote_set_url(test2, cl_git_fixture_url("testrepo.git")));
@ -159,5 +161,4 @@ void test_network_fetchlocal__multi_remotes(void)
git_strarray_free(&refnames); git_strarray_free(&refnames);
git_remote_free(test); git_remote_free(test);
git_remote_free(test2); git_remote_free(test2);
git_repository_free(repo);
} }