proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 19:55:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test that prune overlapping works as expected.

Browse Source
This commit is contained in:
David Calavera 2014-11-12 17:12:30 -08:00 committed by Carlos Martín Nieto
parent ce4b57c6bc
commit 439e19f632
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/remote.c
View File

@ -904,7 +904,6 @@ int git_remote_fetch(
{
int error;
git_buf reflog_msg_buf = GIT_BUF_INIT;
size_t i;
/* Connect and download everything */
if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH)) != 0)

64
tests/network/fetchlocal.c
View File

@ -113,6 +113,70 @@ void test_network_fetchlocal__prune(void)
git_repository_free(repo);
}
void test_network_fetchlocal__prune_overlapping(void)
{
git_repository *repo;
git_remote *origin;
int callcount = 0;
git_strarray refnames = {0};
git_reference *ref;
git_object *obj;
git_config *config;
git_repository *remote_repo = cl_git_sandbox_init("testrepo.git");
cl_git_pass(git_revparse_single(&obj, remote_repo, "master"));
cl_git_pass(git_reference_create(&ref, remote_repo, "refs/pull/42/head", git_object_id(obj), 1, NULL, NULL));
git_object_free(obj);
const char *url = cl_git_path_url(git_repository_path(remote_repo));
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
callbacks.transfer_progress = transfer_cb;
callbacks.payload = &callcount;
cl_set_cleanup(&cleanup_local_repo, "foo");
cl_git_pass(git_repository_init(&repo, "foo", true));
cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url));
git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
cl_git_pass(git_remote_download(origin, NULL));
cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*"));
git_config_free(config);
cl_git_pass(git_remote_load(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
cl_git_pass(git_remote_download(origin, NULL));
cl_git_pass(git_remote_prune(origin));
cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
cl_git_pass(git_revparse_single(&obj, repo, "origin/master"));
cl_git_pass(git_revparse_single(&obj, repo, "origin/pr/42"));
cl_git_pass(git_reference_list(&refnames, repo));
cl_assert_equal_i(20, (int)refnames.count);
cl_git_pass(git_config_delete_multivar(config, "remote.origin.fetch", "refs"));
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*"));
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*"));
cl_git_pass(git_remote_load(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
cl_git_pass(git_remote_download(origin, NULL));
cl_git_pass(git_remote_prune(origin));
cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
cl_git_pass(git_revparse_single(&obj, repo, "origin/master"));
cl_git_pass(git_revparse_single(&obj, repo, "origin/pr/42"));
cl_git_pass(git_reference_list(&refnames, repo));
cl_assert_equal_i(20, (int)refnames.count);
}
void test_network_fetchlocal__fetchprune(void)
{
git_repository *repo;