Merge branch 'nd/lift-path-max'

diff --git a/rerere.c b/rerere.c
index 6fde8f94c27d5a3a196098af0f4716e27566dae5..1f2d21a72f56a68a7f9307bfd9092087687cffae 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -6,6 +6,7 @@
 #include "resolve-undo.h"
 #include "ll-merge.h"
 #include "attr.h"
+#include "pathspec.h"
 
 #define RESOLVED 0
 #define PUNTED 1
@@ -656,7 +657,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
        return 0;
 }
 
-int rerere_forget(const char **pathspec)
+int rerere_forget(struct pathspec *pathspec)
 {
        int i, fd;
        struct string_list conflict = STRING_LIST_INIT_DUP;
@@ -671,8 +672,8 @@ int rerere_forget(const char **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, strlen(it->string),
-                                   0, NULL))
+               if (!match_pathspec_depth(pathspec, it->string, strlen(it->string),
+                                         0, NULL))
                        continue;
                rerere_forget_one_path(it->string, &merge_rr);
        }