Merge branch 'mh/get-remote-group-fix'

diff --git a/unpack-trees.c b/unpack-trees.c
index d6cf84904f189a284b4bd1d72c09ee975207700e..261804e666b77b22d69227562c3ec03365202f53 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1160,6 +1160,14 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        o->src_index = NULL;
        ret = check_updates(o) ? (-2) : 0;
        if (o->dst_index) {
+               if (!ret) {
+                       if (!o->result.cache_tree)
+                               o->result.cache_tree = cache_tree();
+                       if (!cache_tree_fully_valid(o->result.cache_tree))
+                               cache_tree_update(&o->result,
+                                                 WRITE_TREE_SILENT |
+                                                 WRITE_TREE_REPAIR);
+               }
                discard_index(o->dst_index);
                *o->dst_index = o->result;
        } else {