rerere.c: remove implicit dependency on the_index

diff --git a/builtin/am.c b/builtin/am.c
index 5e866d17c7c7b46ccf671916c853be228bf38ad6..4c7a5bc5765c4edb09b136766ff90578db648b04 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1604,7 +1604,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
                o.verbosity = 0;
 
        if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
-               rerere(state->allow_rerere_autoupdate);
+               repo_rerere(the_repository, state->allow_rerere_autoupdate);
                free(their_tree_name);
                return error(_("Failed to merge in the changes."));
        }
@@ -1899,7 +1899,7 @@ static void am_resolve(struct am_state *state)
                        goto next;
        }
 
-       rerere(0);
+       repo_rerere(the_repository, 0);
 
        do_commit(state);