Convert struct object to object_id

[git-core/git.git] / merge.c

diff --git a/merge.c b/merge.c
index fcff632..5db7d56 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -10,7 +10,7 @@
 static const char *merge_argument(struct commit *commit)
 {
        if (commit)
-               return sha1_to_hex(commit->object.sha1);
+               return oid_to_hex(&commit->object.oid);
        else
                return EMPTY_TREE_SHA1_HEX;
 }