Merge branch 'nd/per-worktree-ref-iteration'

diff --git a/sequencer.c b/sequencer.c
index 1869435a721ae6eee502b393357b41a58f4e7582..0d87b0739be5c5fdaf686063729aca02559638b8 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1969,7 +1969,7 @@ static int read_and_refresh_cache(struct replay_opts *opts)
 {
        struct lock_file index_lock = LOCK_INIT;
        int index_fd = hold_locked_index(&index_lock, 0);
-       if (read_index_preload(&the_index, NULL, 0) < 0) {
+       if (read_index(&the_index) < 0) {
                rollback_lock_file(&index_lock);
                return error(_("git %s: failed to read the index"),
                        _(action_name(opts)));
@@ -4899,7 +4899,7 @@ int complete_action(struct replay_opts *opts, unsigned flags,
 
        if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
                return -1;
-;
+
        if (require_clean_work_tree("rebase", "", 1, 1))
                return -1;