summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJameson Miller <jamill@microsoft.com>2018-07-02 19:49:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 17:58:15 (GMT)
commit825ed4d9a044380ac093563e6bd74311ea4488ef (patch)
treefcfb270dee1a6d626b4f2d37cbc45ee3534b4b64 /apply.c
parent768d7965068189ec5287ac53b4b55bfd443bb456 (diff)
downloadgit-825ed4d9a044380ac093563e6bd74311ea4488ef.zip
git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.gz
git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index d79e615..5dd634c 100644
--- a/apply.c
+++ b/apply.c
@@ -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);