diff options
| -rw-r--r-- | src/tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tree.c b/src/tree.c index b67b16249..9655ad739 100644 --- a/src/tree.c +++ b/src/tree.c @@ -1200,6 +1200,9 @@ int git_tree_create_updated(git_oid *out, git_repository *repo, git_tree *baseli last = git_array_last(stack); entry = last->tree ? git_tree_entry_byname(last->tree, component.ptr) : NULL; + if (!entry) + entry = treebuilder_get(last->bld, component.ptr); + if (entry && git_tree_entry_type(entry) != GIT_OBJ_TREE) { giterr_set(GITERR_TREE, "D/F conflict when updating tree"); error = -1; |