Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/resolve-undo.c b/resolve-undo.c
index c09b00664e6892c84424bb4984152883460d3df6..67d1543141bf33b7a44e7f948e9750d35ebf420b 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -182,7 +182,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);
        }