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

refs: Fix issue when packing weak tags

Browse Source 
Weak tags (e.g. tags that point directly to a normal object instead of a
tag object) were failing to be packed.
This commit is contained in:
Vicent Marti 2011-04-08 12:14:33 -07:00
parent 6ac247b381
commit d79f1da65a
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/refs.c
View File

@ -746,7 +746,7 @@ static int packed_write_ref(reference_oid *ref, git_filebuf *file)
*/
static int packed_find_peel(reference_oid *ref)
{
git_tag *tag;
git_object *object;
int error;
if (ref->ref.type & GIT_REF_HAS_PEEL)
@ -760,14 +760,20 @@ static int packed_find_peel(reference_oid *ref)
return GIT_SUCCESS;
/*
* Find the tag in the repository. The tag must exist,
* otherwise this reference is broken and we shouldn't
* pack it.
* Find the tagged object in the repository
*/
error = git_tag_lookup(&tag, ref->ref.owner, &ref->oid);
error = git_object_lookup(&object, ref->ref.owner, &ref->oid, GIT_OBJ_ANY);
if (error < GIT_SUCCESS)
return GIT_EOBJCORRUPTED;
/*
* If the tagged object is a Tag object, we need to resolve it;
* if the ref is actually a 'weak' ref, we don't need to resolve
* anything.
*/
if (git_object_type(object) == GIT_OBJ_TAG) {
git_tag *tag = (git_tag *)object;
/*
* Find the object pointed at by this tag
*/
@ -779,6 +785,7 @@ static int packed_find_peel(reference_oid *ref)
* marked at such. When written to the packfile, it'll be
* accompanied by this resolved oid
*/
}
return GIT_SUCCESS;
}
@ -1419,6 +1426,10 @@ int git_reference_delete(git_reference *ref)
assert(ref);
if (ref->type & GIT_REF_PACKED) {
/* load the existing packfile */
if ((error = packed_load(ref->owner)) < GIT_SUCCESS)
return error;
git_hashtable_remove(ref->owner->references.packfile, ref->name);
error = packed_write(ref->owner);
} else {

BIN
tests/resources/testrepo.git/refs/tags/point_to_blob Normal file
View File

Binary file not shown.

9
tests/t10-refs.c
View File

@ -456,6 +456,11 @@ BEGIN_TEST(pack1, "create a packfile from all the loose rn a repo")
must_be_true((reference->type & GIT_REF_PACKED) == 0);
must_be_true(strcmp(reference->name, loose_tag_ref_name) == 0);
/*
* We are now trying to pack also a loose reference
* called `points_to_blob`, to make sure we can properly
* pack weak tags
*/
must_pass(git_reference_packall(repo));
/* Ensure the packed-refs file exists */
@ -877,10 +882,10 @@ BEGIN_TEST(list0, "try to list all the references in our test repo")
printf("# %s\n", ref_list.strings[i]);
}*/
/* We have exactly 7 refs in total if we include the packed ones:
/* We have exactly 8 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);
must_be_true(ref_list.count == 8);
git_strarray_free(&ref_list);
git_repository_free(repo);