Merge branch 'md/list-lazy-objects-fix'

diff --git a/unpack-trees.c b/unpack-trees.c
index 51bfac6aa0bea246cdf6415490654b7ca2e4b9c2..6d53cbfc865096ea41028c0601aa12d6eeb8a145 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -380,7 +380,7 @@ static int check_updates(struct unpack_trees_options *o)
 {
        unsigned cnt = 0;
        int errs = 0;
-       struct progress *progress = NULL;
+       struct progress *progress;
        struct index_state *index = &o->result;
        struct checkout state = CHECKOUT_INIT;
        int i;
@@ -1630,7 +1630,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
                move_index_extensions(&o->result, o->src_index);
                if (!ret) {
                        if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
-                               cache_tree_verify(&o->result);
+                               cache_tree_verify(the_repository, &o->result);
                        if (!o->result.cache_tree)
                                o->result.cache_tree = cache_tree();
                        if (!cache_tree_fully_valid(o->result.cache_tree))