tree: handle removal of all entries in the updatercmn/remove-single-entry

When we remove all entries in a tree, we should remove that tree from
its parent rather than include the empty tree.

1 files changed, 9 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);