Convert struct object to object_id

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index a1505002bde43259af08636195e9056dae91b77a..12aba984eb985d6c4bf8e08bf455f1a47a7f9f47 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -378,7 +378,7 @@ static void shortlog(const char *name,
 
                if (!sb.len)
                        string_list_append(&subjects,
-                                          sha1_to_hex(commit->object.sha1));
+                                          oid_to_hex(&commit->object.oid));
                else
                        string_list_append(&subjects, strbuf_detach(&sb, NULL));
        }