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

fetch: remove the prune setter

Browse Source 
This option does not get persisted to disk, which makes it different
from the rest of the setters. Remove it until we go all the way.

We still respect the configuration option, and it's still possible to
perform a one-time prune by calling the function.
This commit is contained in:
Carlos Martín Nieto 2014-12-14 21:01:19 +01:00
parent 7b6e1e4cc6
commit 26186b155b
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/git2/remote.h
View File

@ -600,16 +600,6 @@ GIT_EXTERN(void) git_remote_set_autotag(
*/ */
GIT_EXTERN(int) git_remote_prune_refs(const git_remote *remote); GIT_EXTERN(int) git_remote_prune_refs(const git_remote *remote);
/**
* Set the ref-prune setting
*
* @param remote the remote to configure
* @param value a boolean value
*/
GIT_EXTERN(void) git_remote_set_prune_refs(
git_remote *remote,
int value);
/** /**
* Give the remote a new name * Give the remote a new name
* *

5
src/remote.c
View File

@ -1632,11 +1632,6 @@ int git_remote_prune_refs(const git_remote *remote)
return remote->prune_refs; return remote->prune_refs;
} }
void git_remote_set_prune_refs(git_remote *remote, int value)
{
remote->prune_refs = value;
}
static int rename_remote_config_section( static int rename_remote_config_section(
git_repository *repo, git_repository *repo,
const char *old_name, const char *old_name,

6
tests/network/fetchlocal.c
View File

@ -153,10 +153,10 @@ void test_network_fetchlocal__prune_overlapping(void)
git_remote_set_callbacks(origin, &callbacks); git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_repository_config(&config, repo)); cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_config_set_bool(config, "remote.origin.prune", true));
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/pull/*/head:refs/remotes/origin/pr/*"));
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_prune_refs(origin, 1);
git_remote_set_callbacks(origin, &callbacks); git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL)); cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
@ -170,7 +170,6 @@ void test_network_fetchlocal__prune_overlapping(void)
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*")); cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*"));
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_prune_refs(origin, true);
callbacks.update_tips = update_tips_fail_on_call; callbacks.update_tips = update_tips_fail_on_call;
git_remote_set_callbacks(origin, &callbacks); git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL)); cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
@ -184,7 +183,6 @@ void test_network_fetchlocal__prune_overlapping(void)
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*")); cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*"));
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/pull/*/head:refs/remotes/origin/pr/*"));
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_prune_refs(origin, true);
callbacks.update_tips = update_tips_fail_on_call; callbacks.update_tips = update_tips_fail_on_call;
git_remote_set_callbacks(origin, &callbacks); git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL)); cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
@ -234,9 +232,9 @@ void test_network_fetchlocal__fetchprune(void)
git_reference_free(ref); git_reference_free(ref);
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_prune_refs(origin, 1);
git_remote_set_callbacks(origin, &callbacks); git_remote_set_callbacks(origin, &callbacks);
cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL)); cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
cl_git_pass(git_remote_prune(origin));
cl_git_pass(git_reference_list(&refnames, repo)); cl_git_pass(git_reference_list(&refnames, repo));
cl_assert_equal_i(18, (int)refnames.count); cl_assert_equal_i(18, (int)refnames.count);