rerere.c: remove implicit dependency on the_index

diff --git a/revision.c b/revision.c
index 3457064ff3cd59d075ac537ab0651b86f2232be3..d70587678c278b93ed304f3e8cc5a052d7f5254a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -877,7 +877,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
                return;
 
        left_first = left_count < right_count;
-       init_patch_ids(&ids);
+       init_patch_ids(the_repository, &ids);
        ids.diffopts.pathspec = revs->diffopt.pathspec;
 
        /* Compute patch-ids for one side */
@@ -1468,7 +1468,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        grep_init(&revs->grep_filter, the_repository, prefix);
        revs->grep_filter.status_only = 1;
 
-       diff_setup(&revs->diffopt);
+       repo_diff_setup(the_repository, &revs->diffopt);
        if (prefix && !revs->diffopt.prefix) {
                revs->diffopt.prefix = prefix;
                revs->diffopt.prefix_length = strlen(prefix);