cache-tree: use is_empty_tree_oid

diff --git a/unpack-trees.c b/unpack-trees.c
index 79fd97074ec238714634de1c9e6144accdc710f3..038ef7b92683257f3a47806d91a0dd560549d363 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1287,7 +1287,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        o->result.split_index = o->src_index->split_index;
        if (o->result.split_index)
                o->result.split_index->refcount++;
-       hashcpy(o->result.sha1, o->src_index->sha1);
+       oidcpy(&o->result.oid, &o->src_index->oid);
        o->merge_size = len;
        mark_all_ce_unused(o->src_index);
 
@@ -1509,8 +1509,8 @@ static int verify_uptodate_1(const struct cache_entry *ce,
                add_rejected_path(o, error_type, ce->name);
 }
 
-int verify_uptodate(const struct cache_entry *ce,
-                   struct unpack_trees_options *o)
+static int verify_uptodate(const struct cache_entry *ce,
+                          struct unpack_trees_options *o)
 {
        if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
                return 0;