subtree: improve decision on merges kept in split

diff --git a/cache-tree.c b/cache-tree.c
index c3c206427cccbd0a468974eb59d4b41b6bd84b43..5ce51468f0b402fd2121e2c8b51ff12703d431ba 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -655,11 +655,6 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state,
        return ret;
 }
 
-int write_cache_as_tree(struct object_id *oid, int flags, const char *prefix)
-{
-       return write_index_as_tree(oid, &the_index, get_index_file(), flags, prefix);
-}
-
 static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
 {
        struct tree_desc desc;
@@ -722,18 +717,11 @@ int cache_tree_matches_traversal(struct cache_tree *root,
 
        it = find_cache_tree_from_traversal(root, info);
        it = cache_tree_find(it, ent->path);
-       if (it && it->entry_count > 0 && !oidcmp(ent->oid, &it->oid))
+       if (it && it->entry_count > 0 && oideq(ent->oid, &it->oid))
                return it->entry_count;
        return 0;
 }
 
-int update_main_cache_tree(int flags)
-{
-       if (!the_index.cache_tree)
-               the_index.cache_tree = cache_tree();
-       return cache_tree_update(&the_index, flags);
-}
-
 static void verify_one(struct index_state *istate,
                       struct cache_tree *it,
                       struct strbuf *path)