test: make FILEMODE a lazy prereq

[thirdparty/git.git] / resolve-undo.c

diff --git a/resolve-undo.c b/resolve-undo.c
index 77101f51c153ab014ecb80a02ca52daaa16cb10d..c09b00664e6892c84424bb4984152883460d3df6 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -173,7 +173,7 @@ void unmerge_marked_index(struct index_state *istate)
        }
 }
 
-void unmerge_index(struct index_state *istate, const char **pathspec)
+void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
 {
        int i;
 
@@ -182,7 +182,7 @@ void unmerge_index(struct index_state *istate, const char **pathspec)
 
        for (i = 0; i < istate->cache_nr; i++) {
                const struct cache_entry *ce = istate->cache[i];
-               if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL))
+               if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))
                        continue;
                i = unmerge_index_entry_at(istate, i);
        }