Move print_commit_list to libgit.a
[gitweb.git] / sequencer.c
index dbef5cea027f61a8172c4889005c090f1d0df048..be0cb8b1076dc29bee5a77fbbde155514723c6a8 100644 (file)
@@ -19,7 +19,7 @@
 
 const char sign_off_header[] = "Signed-off-by: ";
 
-void remove_sequencer_state(void)
+static void remove_sequencer_state(void)
 {
        struct strbuf seq_dir = STRBUF_INIT;
 
@@ -191,7 +191,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from)
        struct ref_lock *ref_lock;
 
        read_cache();
-       if (checkout_fast_forward(from, to))
+       if (checkout_fast_forward(from, to, 1))
                exit(1); /* the callee should have complained already */
        ref_lock = lock_any_ref_for_update("HEAD", from, 0);
        return write_ref_sha1(ref_lock, to, "cherry-pick");