diff options
| author | Jameson Miller <jamill@microsoft.com> | 2018-07-02 21:49:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 19:58:15 +0200 |
| commit | 825ed4d9a044380ac093563e6bd74311ea4488ef (patch) | |
| tree | fcfb270dee1a6d626b4f2d37cbc45ee3534b4b64 /resolve-undo.c | |
| parent | read-cache: teach refresh_cache_entry to take istate (diff) | |
| download | git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.xz git-825ed4d9a044380ac093563e6bd74311ea4488ef.zip | |
read-cache: teach make_cache_entry to take object_id
Teach make_cache_entry function to take object_id instead of a SHA-1.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
| -rw-r--r-- | resolve-undo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.c b/resolve-undo.c index fc5b3b83d9..4d4e5cb6bf 100644 --- 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; |