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

Remove duplicate refs in git_reference_listall

Browse Source
This commit is contained in:
Vicent Marti 2011-03-15 05:38:50 +02:00
parent 5f8078d4dc
commit 7ad96e51ca
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/refs.c
View File

@ -546,6 +546,7 @@ cleanup:
struct dirent_list_data { struct dirent_list_data {
git_vector ref_list; git_vector ref_list;
git_repository *repo;
size_t repo_path_len; size_t repo_path_len;
unsigned int list_flags; unsigned int list_flags;
}; };
@ -553,16 +554,18 @@ struct dirent_list_data {
static int _dirent_loose_listall(void *_data, char *full_path) static int _dirent_loose_listall(void *_data, char *full_path)
{ {
struct dirent_list_data *data = (struct dirent_list_data *)_data; struct dirent_list_data *data = (struct dirent_list_data *)_data;
char *file_path; char *file_path = full_path + data->repo_path_len;
if (gitfo_isdir(full_path) == GIT_SUCCESS) if (gitfo_isdir(full_path) == GIT_SUCCESS)
return gitfo_dirent(full_path, GIT_PATH_MAX, _dirent_loose_listall, _data); return gitfo_dirent(full_path, GIT_PATH_MAX, _dirent_loose_listall, _data);
/* do not add twice a reference that exists already in the packfile */
if (git_hashtable_lookup(data->repo->references.packfile, file_path) != NULL)
return GIT_SUCCESS;
if ((data->list_flags & loose_guess_rtype(full_path)) == 0) if ((data->list_flags & loose_guess_rtype(full_path)) == 0)
return GIT_SUCCESS; /* we are filtering out this reference */ return GIT_SUCCESS; /* we are filtering out this reference */
file_path = full_path + data->repo_path_len;
return git_vector_insert(&data->ref_list, git__strdup(file_path)); return git_vector_insert(&data->ref_list, git__strdup(file_path));
} }
@ -1336,15 +1339,9 @@ int git_reference_listall(git_strarray *array, git_repository *repo, unsigned in
git_vector_init(&data.ref_list, 8, NULL); git_vector_init(&data.ref_list, 8, NULL);
data.repo_path_len = strlen(repo->path_repository); data.repo_path_len = strlen(repo->path_repository);
data.list_flags = list_flags; data.list_flags = list_flags;
data.repo = repo;
git__joinpath(refs_path, repo->path_repository, GIT_REFS_DIR); /* list all the packed references first */
error = gitfo_dirent(refs_path, GIT_PATH_MAX, _dirent_loose_listall, &data);
if (error < GIT_SUCCESS) {
git_vector_free(&data.ref_list);
return error;
}
if (list_flags & GIT_REF_PACKED) { if (list_flags & GIT_REF_PACKED) {
const char *ref_name; const char *ref_name;
void *_unused; void *_unused;
@ -1359,6 +1356,16 @@ int git_reference_listall(git_strarray *array, git_repository *repo, unsigned in
); );
} }
/* now list the loose references, trying not to
* duplicate the ref names already in the packed-refs file */
git__joinpath(refs_path, repo->path_repository, GIT_REFS_DIR);
error = gitfo_dirent(refs_path, GIT_PATH_MAX, _dirent_loose_listall, &data);
if (error < GIT_SUCCESS) {
git_vector_free(&data.ref_list);
return error;
}
array->strings = (char **)data.ref_list.contents; array->strings = (char **)data.ref_list.contents;
array->count = data.ref_list.length; array->count = data.ref_list.length;
return GIT_SUCCESS; return GIT_SUCCESS;

6
tests/t10-refs.c
View File

@ -716,7 +716,11 @@ BEGIN_TEST(list0, "try to list all the references in our test repo")
must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); must_pass(git_repository_open(&repo, REPOSITORY_FOLDER));
must_pass(git_reference_listall(&ref_list, repo, GIT_REF_LISTALL)); must_pass(git_reference_listall(&ref_list, repo, GIT_REF_LISTALL));
must_be_true(ref_list.count == 8); /* 8 refs in total if we include the packed ones */
/* We have exactly 7 refs in total if we include the packed ones:
* there is a reference that exists both in the packfile and as
* loose, but we only list it once */
must_be_true(ref_list.count == 7);
git_strarray_free(&ref_list); git_strarray_free(&ref_list);
git_repository_free(repo); git_repository_free(repo);