Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint

diff --git a/tree-walk.c b/tree-walk.c
index 5ece8c3477b11f3bf0c54196924ac24568309225..e06f240c7515ab7b08c4441c3cb48fce1602d0e2 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -743,7 +743,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
 
                if (item->nowildcard_len &&
                    !match_wildcard_base(item, base_str, baselen, &matched))
-                       return entry_not_interesting;
+                       continue;
 
                /*
                 * Concatenate base and entry->path into one and do