pathspec: convert some match_pathspec_depth() to dir_path_match()

diff --git a/tree-walk.h b/tree-walk.h
index 2bf0db9814a5c9f77fe00c97fa4f723986a7aac1..ae04b6417de0ff06391cc7e2d98fcd1b7d5aa633 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -46,7 +46,7 @@ struct traverse_info {
        int pathlen;
        struct pathspec *pathspec;
 
-       unsigned long conflicts;
+       unsigned long df_conflicts;
        traverse_callback_t fn;
        void *data;
        int show_all_errors;