builtin/cat-file: convert struct expand_data to use struct object_id

diff --git a/merge-recursive.c b/merge-recursive.c
index e34912683ca106524616673f96fff538af8447ed..e3db594da168a312134f9870606c04fa0995a3b9 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -382,7 +382,7 @@ static struct string_list *get_unmerged(void)
                }
                e = item->util;
                e->stages[ce_stage(ce)].mode = ce->ce_mode;
-               hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1);
+               oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
        }
 
        return unmerged;