merge-tree: drop generate_common strategy

diff --git a/unpack-trees.c b/unpack-trees.c
index 4a6347899c02b8110b2e65b355e42e2c65cef706..17a5eeb6cd0e211c8c5215ff1ebec912739f5d21 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1157,6 +1157,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        if (o->dst_index) {
                discard_index(o->dst_index);
                *o->dst_index = o->result;
+       } else {
+               discard_index(&o->result);
        }
 
 done: