merge: convert checkout_fast_forward to struct object_id

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 9ca352ac78472dd285d7102599815e393caa8a67..dcc56a2b6905777559225252e4b906709b451d26 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -382,7 +382,7 @@ static int fast_forward_to(const struct object_id *to, const struct object_id *f
        struct strbuf err = STRBUF_INIT;
 
        read_cache();
-       if (checkout_fast_forward(from->hash, to->hash, 1))
+       if (checkout_fast_forward(from, to, 1))
                return -1; /* the callee should have complained already */
 
        strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));