tree_entry_interesting(): fix depth limit with overlapping pathspecs

[git.git] / tree-walk.c

diff --git a/tree-walk.c b/tree-walk.c
index 83bede952734a72d9d2d22e9ee1aafd98102ab3b..be8182c72f90764c77807f6e872a0f333efa3edc 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "tree-walk.h"
 #include "unpack-trees.h"
+#include "dir.h"
 #include "tree.h"
 
 static const char *get_mode(const char *str, unsigned int *modep)
@@ -559,12 +560,17 @@ int tree_entry_interesting(const struct name_entry *entry,
        int pathlen, baselen = base->len;
        int never_interesting = -1;
 
-       if (!ps || !ps->nr)
-               return 2;
+       if (!ps->nr) {
+               if (!ps->recursive || ps->max_depth == -1)
+                       return 2;
+               return !!within_depth(base->buf, baselen,
+                                     !!S_ISDIR(entry->mode),
+                                     ps->max_depth);
+       }
 
        pathlen = tree_entry_len(entry->path, entry->sha1);
 
-       for (i = 0; i < ps->nr; i++) {
+       for (i = ps->nr-1; i >= 0; i--) {
                const struct pathspec_item *item = ps->items+i;
                const char *match = item->match;
                int matchlen = item->len;
@@ -573,7 +579,14 @@ int tree_entry_interesting(const struct name_entry *entry,
                        /* If it doesn't match, move along... */
                        if (!match_dir_prefix(base->buf, baselen, match, matchlen))
                                continue;
-                       return 2;
+
+                       if (!ps->recursive || ps->max_depth == -1)
+                               return 2;
+
+                       return !!within_depth(base->buf + matchlen + 1,
+                                             baselen - matchlen - 1,
+                                             !!S_ISDIR(entry->mode),
+                                             ps->max_depth);
                }
 
                /* Does the base match? */