diff options
Diffstat (limited to 'src/tree.c')
-rw-r--r-- | src/tree.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/tree.c b/src/tree.c index be0f528c2..96426c924 100644 --- a/src/tree.c +++ b/src/tree.c @@ -447,15 +447,16 @@ static int append_entry( git_treebuilder *bld, const char *filename, const git_oid *id, - git_filemode_t filemode) + git_filemode_t filemode, + bool from_tree) { git_tree_entry *entry; int error = 0; - if (!valid_entry_name(bld->repo, filename)) + if (!from_tree && !valid_entry_name(bld->repo, filename)) return tree_error("failed to insert entry: invalid name for a tree entry", filename); - if (git_oid_iszero(id)) + if (!from_tree && git_oid_iszero(id)) return tree_error("failed to insert entry: invalid null OID for a tree entry", filename); entry = alloc_entry(filename, strlen(filename), id); @@ -553,12 +554,12 @@ static int write_tree( last_comp = subdir; } - error = append_entry(bld, last_comp, &sub_oid, S_IFDIR); + error = append_entry(bld, last_comp, &sub_oid, S_IFDIR, false); git__free(subdir); if (error < 0) goto on_error; } else { - error = append_entry(bld, filename, &entry->id, entry->mode); + error = append_entry(bld, filename, &entry->id, entry->mode, false); if (error < 0) goto on_error; } @@ -656,7 +657,8 @@ int git_treebuilder_new( if (append_entry( bld, entry_src->filename, entry_src->oid, - entry_src->attr) < 0) + entry_src->attr, + true) < 0) goto on_error; } } |