Merge branch 'ma/config-store-data-clear'

diff --git a/unpack-trees.c b/unpack-trees.c
index 7051fcf7d841c9526f4e0e83dd32d6922835e181..d17f726e7572985c8c2fa5289bafe7c1b78eaa00 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1298,7 +1298,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        } else {
                o->result.split_index = init_split_index(&o->result);
        }
-       hashcpy(o->result.sha1, o->src_index->sha1);
+       oidcpy(&o->result.oid, &o->src_index->oid);
        o->merge_size = len;
        mark_all_ce_unused(o->src_index);