read-cache: teach make_cache_entry to take object_id

diff --git a/resolve-undo.c b/resolve-undo.c
index fc5b3b83d9a08e9deed55ee15520387f147da626..4d4e5cb6bf9c48aa66ec70eee780d2455563d099 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -146,7 +146,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
                struct cache_entry *nce;
                if (!ru->mode[i])
                        continue;
-               nce = make_cache_entry(ru->mode[i], ru->oid[i].hash,
+               nce = make_cache_entry(ru->mode[i], &ru->oid[i],
                                       name, i + 1, 0);
                if (matched)
                        nce->ce_flags |= CE_MATCHED;