Merge branch 'jk/add-ignore-errors-bit-assignment-fix'

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 183ee8c1e5d4de53d10e9ed00c624f615baf3fc9..ac255ad2c243192a9afd3b4578a2a501eb250aff 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -258,7 +258,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
         * what came from the tree.
         */
        if (nr_trees == 1 && !opts.prefix)
-               prime_cache_tree(&the_index, trees[0]);
+               prime_cache_tree(the_repository,
+                                the_repository->index,
+                                trees[0]);
 
        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
                die("unable to write new index file");