ll-merge.c: remove implicit dependency on the_index

diff --git a/revision.c b/revision.c
index de4dce600d00282655907e9014228791a352f813..0c6dc8c163fe2e21040b08b5762fc9409b4fb969 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1464,11 +1464,11 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->commit_format = CMIT_FMT_DEFAULT;
        revs->expand_tabs_in_log_default = 8;
 
-       init_grep_defaults();
-       grep_init(&revs->grep_filter, prefix);
+       init_grep_defaults(the_repository);
+       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);