diff options
| author | Jameson Miller <jamill@microsoft.com> | 2018-07-02 22:49:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 20:58:15 +0300 |
| commit | 825ed4d9a044380ac093563e6bd74311ea4488ef (patch) | |
| tree | fcfb270dee1a6d626b4f2d37cbc45ee3534b4b64 /apply.c | |
| parent | 768d7965068189ec5287ac53b4b55bfd443bb456 (diff) | |
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 'apply.c')
| -rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4090,7 +4090,7 @@ static int build_fake_ancestor(struct apply_state *state, struct patch *list) return error(_("sha1 information is lacking or useless " "(%s)."), name); - ce = make_cache_entry(patch->old_mode, oid.hash, name, 0, 0); + ce = make_cache_entry(patch->old_mode, &oid, name, 0, 0); if (!ce) return error(_("make_cache_entry failed for path '%s'"), name); |