grep.c: remove implicit dependency on the_index
[gitweb.git] / rerere.c
index 16c8aac6211ac74de77b1f2cad5eddb4d1abcc95..c7787aa07f80f00589e3c4f4e4e3cc825c43044e 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -1120,7 +1120,7 @@ int rerere_forget(struct pathspec *pathspec)
        find_conflict(&conflict);
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];
-               if (!match_pathspec(pathspec, it->string,
+               if (!match_pathspec(&the_index, pathspec, it->string,
                                    strlen(it->string), 0, NULL, 0))
                        continue;
                rerere_forget_one_path(it->string, &merge_rr);