Fifth batch for 2.14

diff --git a/unpack-trees.c b/unpack-trees.c
index c312c2cd3affa49b17fad336dce6be89fcc954ba..d38c37e38cf183cf878a9f35b19544d1da0bc438 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1396,6 +1396,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
                                                  WRITE_TREE_SILENT |
                                                  WRITE_TREE_REPAIR);
                }
+               move_index_extensions(&o->result, o->dst_index);
                discard_index(o->dst_index);
                *o->dst_index = o->result;
        } else {