Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void'

diff --git a/notes-merge.c b/notes-merge.c
index cb36b43ca7e56b61f3b87bbaf5c176d81efd1b6d..b3536284c4954be3f24f9c68e4d52c42ec29eed1 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -344,9 +344,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
        mmfile_t base, local, remote;
        int status;
 
-       read_mmblob(&base, p->base.hash);
-       read_mmblob(&local, p->local.hash);
-       read_mmblob(&remote, p->remote.hash);
+       read_mmblob(&base, &p->base);
+       read_mmblob(&local, &p->local);
+       read_mmblob(&remote, &p->remote);
 
        status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
                          &local, o->local_ref, &remote, o->remote_ref, NULL);