Convert struct object to object_id

diff --git a/notes-merge.c b/notes-merge.c
index 21e1eb4caa88d37f79ea2a953bb0c337c359bf68..7b1099c9a23d9eee44a99e269ba07ac344eccba9 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -618,8 +618,8 @@ int notes_merge(struct notes_merge_options *o,
 
        if (o->verbosity >= 4)
                printf("Merging remote commit %.7s into local commit %.7s with "
-                       "merge-base %.7s\n", sha1_to_hex(remote->object.sha1),
-                       sha1_to_hex(local->object.sha1),
+                       "merge-base %.7s\n", oid_to_hex(&remote->object.oid),
+                       oid_to_hex(&local->object.oid),
                        sha1_to_hex(base_sha1));
 
        if (!hashcmp(get_object_hash(remote->object), base_sha1)) {