The fifth batch

[thirdparty/git.git] / delta-islands.c

diff --git a/delta-islands.c b/delta-islands.c
index ee2318d45a1c7898b39999b1f5fc81be8ec49f00..4ac3c10551a2608d7846d59252b127cd48dc0cc5 100644 (file)
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -284,7 +284,7 @@ void resolve_tree_islands(struct repository *r,
                if (!tree || parse_tree(tree) < 0)
                        die(_("bad tree object %s"), oid_to_hex(&ent->idx.oid));
 
-               init_tree_desc(&desc, tree->buffer, tree->size);
+               init_tree_desc(&desc, &tree->object.oid, tree->buffer, tree->size);
                while (tree_entry(&desc, &entry)) {
                        struct object *obj;
 
@@ -488,7 +488,8 @@ void load_delta_islands(struct repository *r, int progress)
 
        git_config(island_config_callback, &ild);
        ild.remote_islands = kh_init_str();
-       for_each_ref(find_island_for_ref, &ild);
+       refs_for_each_ref(get_main_ref_store(the_repository),
+                         find_island_for_ref, &ild);
        free_config_regexes(&ild);
        deduplicate_islands(ild.remote_islands, r);
        free_remote_islands(ild.remote_islands);