notes-merge: convert write_note_to_worktree to struct object_id

[thirdparty/git.git] / notes-utils.c

diff --git a/notes-utils.c b/notes-utils.c
index 36c1490aa782dfda49bccc416b8cc733adeafc70..b2aada90a2eab97aa31b57da356a738636c32b6c 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -18,7 +18,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
                /* Deduce parent commit from t->ref */
                struct object_id parent_oid;
                if (!read_ref(t->ref, parent_oid.hash)) {
-                       struct commit *parent = lookup_commit(parent_oid.hash);
+                       struct commit *parent = lookup_commit(&parent_oid);
                        if (parse_commit(parent))
                                die("Failed to find/parse commit %s", t->ref);
                        commit_list_insert(parent, &parents);
@@ -155,7 +155,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
 }
 
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
-                         const unsigned char *from_obj, const unsigned char *to_obj)
+                         const struct object_id *from_obj, const struct object_id *to_obj)
 {
        int ret = 0;
        int i;