Convert read_mmblob to take struct object_id.

[git/git.git] / builtin / checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index ec85af5..1316922 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -195,9 +195,9 @@ static int checkout_merged(int pos, struct checkout *state)
        if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2]))
                return error(_("path '%s' does not have necessary versions"), path);
 
-       read_mmblob(&ancestor, threeway[0].hash);
-       read_mmblob(&ours, threeway[1].hash);
-       read_mmblob(&theirs, threeway[2].hash);
+       read_mmblob(&ancestor, &threeway[0]);
+       read_mmblob(&ours, &threeway[1]);
+       read_mmblob(&theirs, &threeway[2]);
 
        /*
         * NEEDSWORK: re-create conflicts from merges with