Merge branch 'nd/submodule-pathspec-ending-with-slash'

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

diff --git a/resolve-undo.c b/resolve-undo.c
index 49ebaaf8d8b269b374ad3ccbfc57acccd83fe006..44c697c36d0b406330aeb084db1d6a4be715d6c6 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -185,7 +185,7 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
 
        for (i = 0; i < istate->cache_nr; i++) {
                const struct cache_entry *ce = istate->cache[i];
-               if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))
+               if (!ce_path_match(ce, pathspec, NULL))
                        continue;
                i = unmerge_index_entry_at(istate, i);
        }