builtin/unpack-objects: convert to struct object_id

diff --git a/builtin/merge.c b/builtin/merge.c
index 703827f00668ca0df807f35e300f0927d00075cd..f11b5f3de4f7cd849b8e8901bc1711464b2f8c8c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1123,7 +1123,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        if (!branch || is_null_oid(&head_oid))
                head_commit = NULL;
        else
-               head_commit = lookup_commit_or_die(head_oid.hash, "HEAD");
+               head_commit = lookup_commit_or_die(&head_oid, "HEAD");
 
        init_diff_ui_defaults();
        git_config(git_merge_config, NULL);