diff options
author | Carlos Martín Nieto <carlosmn@github.com> | 2016-05-24 16:15:57 +0200 |
---|---|---|
committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-05-24 16:15:57 +0200 |
commit | c756448cefdf7369f30c45e9427ad5ba67e33483 (patch) | |
tree | 35413be2e32565798a07568f1bdcc60e12b35560 | |
parent | c91a1dc1d975aa32c58cfafbf1625dcbb0be7c3c (diff) | |
parent | a2cb47130ec7662811fe3447f69bae3f176e0362 (diff) | |
download | libgit2-c756448cefdf7369f30c45e9427ad5ba67e33483.tar.gz |
Merge pull request #3797 from libgit2/cmn/remove-single-entry
tree: handle removal of all entries in the updater
-rw-r--r-- | src/tree.c | 9 | ||||
-rw-r--r-- | tests/object/tree/update.c | 32 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/tree.c b/src/tree.c index 4a9051cf8..43eefa50e 100644 --- a/src/tree.c +++ b/src/tree.c @@ -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); diff --git a/tests/object/tree/update.c b/tests/object/tree/update.c index 32e029a6d..54c4335f5 100644 --- a/tests/object/tree/update.c +++ b/tests/object/tree/update.c @@ -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; |