rebase-interactive.c: remove the_repository references

diff --git a/sequencer.c b/sequencer.c
index 111cb747d60283ee8575936a0c20d5a27a377f84..d726f77e11bf39e44037f65bf7bb561df4fd76bf 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1713,7 +1713,7 @@ static int do_pick_commit(struct repository *r,
                        unborn = 1;
                } else if (unborn)
                        oidcpy(&head, the_hash_algo->empty_tree);
-               if (index_differs_from(unborn ? empty_tree_oid_hex() : "HEAD",
+               if (index_differs_from(r, unborn ? empty_tree_oid_hex() : "HEAD",
                                       NULL, 0))
                        return error_dirty_index(r->index, opts);
        }
@@ -2991,7 +2991,7 @@ static int do_reset(struct repository *r,
        }
 
        tree = parse_tree_indirect(&oid);
-       prime_cache_tree(r->index, tree);
+       prime_cache_tree(r, r->index, tree);
 
        if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0)
                ret = error(_("could not write index"));
@@ -3915,7 +3915,7 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
                        if (res)
                                goto release_todo_list;
                }
-               if (index_differs_from("HEAD", NULL, 0)) {
+               if (index_differs_from(r, "HEAD", NULL, 0)) {
                        res = error_dirty_index(r->index, opts);
                        goto release_todo_list;
                }