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

tree: handle removal of all entries in the updater

Browse Source 
When we remove all entries in a tree, we should remove that tree from
its parent rather than include the empty tree.
This commit is contained in:
Carlos Martín Nieto 2016-05-24 14:30:43 +02:00
parent c91a1dc1d9
commit a2cb47130e
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tree.c
View File

@ -1093,6 +1093,15 @@ static int create_popped_tree(tree_stack_entry *current, tree_stack_entry *poppe
git_oid new_tree;
git_tree_free(popped->tree);
/* If the tree would be empty, remove it from the one higher up */
if (git_treebuilder_entrycount(popped->bld) == 0) {
git_treebuilder_free(popped->bld);
error = git_treebuilder_remove(current->bld, popped->name);
git__free(popped->name);
return error;
}
error = git_treebuilder_write(&new_tree, popped->bld);
git_treebuilder_free(popped->bld);

32
tests/object/tree/update.c
View File

@ -71,6 +71,38 @@ void test_object_tree_update__remove_blob_deeper(void)
git_tree_free(base_tree);
}
void test_object_tree_update__remove_all_entries(void)
{
git_oid tree_index_id, tree_updater_id, base_id;
git_tree *base_tree;
git_index *idx;
const char *path1 = "subdir/subdir2/README";
const char *path2 = "subdir/subdir2/new.txt";
git_tree_update updates[] = {
{ GIT_TREE_UPDATE_REMOVE, {{0}}, GIT_FILEMODE_BLOB /* ignored */, path1},
{ GIT_TREE_UPDATE_REMOVE, {{0}}, GIT_FILEMODE_BLOB /* ignored */, path2},
};
cl_git_pass(git_oid_fromstr(&base_id, "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b"));
cl_git_pass(git_tree_lookup(&base_tree, g_repo, &base_id));
/* Create it with an index */
cl_git_pass(git_index_new(&idx));
cl_git_pass(git_index_read_tree(idx, base_tree));
cl_git_pass(git_index_remove(idx, path1, 0));
cl_git_pass(git_index_remove(idx, path2, 0));
cl_git_pass(git_index_write_tree_to(&tree_index_id, idx, g_repo));
git_index_free(idx);
/* Perform the same operation via the tree updater */
cl_git_pass(git_tree_create_updated(&tree_updater_id, g_repo, base_tree, 2, updates));
cl_assert_equal_oid(&tree_index_id, &tree_updater_id);
git_tree_free(base_tree);
}
void test_object_tree_update__replace_blob(void)
{
git_oid tree_index_id, tree_updater_id, base_id;