Merge branch 'da/difftool-git-files' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 3767478c6ddb02cf8a4a418f8911102aeaacfbe8..26b2986abe679b594798748b4776917050b1bd4d 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -234,7 +234,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
 
                if (ce->ce_flags & CE_UPDATE)
                        continue;
-               if (!match_pathspec_depth(pattern, ce->name, ce_namelen(ce), 0, m))
+               if (!ce_path_match(ce, pattern, m))
                        continue;
                item = string_list_insert(list, ce->name);
                if (ce_skip_worktree(ce))