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

Fix reference removal: remove packed refs together with loose ones

Browse Source
This commit is contained in:
nulltoken 2011-03-03 19:58:07 +02:00 committed by Vicent Marti
parent d561403f08
commit 5ad0351db1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/refs.c
View File

@ -1089,15 +1089,18 @@ int git_reference_set_target(git_reference *ref, const char *target)
* operation. We need to remove the reference from * operation. We need to remove the reference from
* the memory cache and then rewrite the whole pack * the memory cache and then rewrite the whole pack
* *
* If the reference is loose, we just remove it on * If the reference is loose, we remove it on
* the filesystem and update the in-memory cache * the filesystem and update the in-memory cache
* accordingly. * accordingly. We also make sure that an older version
* of it doesn't exist as a packed reference. If this
* is the case, this packed reference is removed as well.
* *
* This obviously invalidates the `ref` pointer. * This obviously invalidates the `ref` pointer.
*/ */
int git_reference_delete(git_reference *ref) int git_reference_delete(git_reference *ref)
{ {
int error; int error;
git_reference *reference;
assert(ref); assert(ref);
@ -1109,8 +1112,19 @@ int git_reference_delete(git_reference *ref)
git__joinpath(full_path, ref->owner->path_repository, ref->name); git__joinpath(full_path, ref->owner->path_repository, ref->name);
git_hashtable_remove(ref->owner->references.loose_cache, ref->name); git_hashtable_remove(ref->owner->references.loose_cache, ref->name);
error = gitfo_unlink(full_path); error = gitfo_unlink(full_path);
if (error < GIT_SUCCESS)
goto cleanup;
/* When deleting a loose reference, we have to ensure that an older
* packed version of it doesn't exist
*/
if (!git_repository_lookup_ref(&reference, ref->owner, ref->name)) {
assert((reference->type & GIT_REF_PACKED) != 0);
error = git_reference_delete(reference);
}
} }
cleanup:
reference_free(ref); reference_free(ref);
return error; return error;
} }