Merge branch 'jc/check-attr-honor-working-tree' into maint

diff --git a/tree-walk.c b/tree-walk.c
index 680afda060e28fd15c0064bd51cb829dc2469b1c..79dba1d0f4e729b5e62825d347c7e6a9b1455f1d 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -543,7 +543,7 @@ static int match_entry(const struct pathspec_item *item,
        if (matchlen > pathlen) {
                if (match[pathlen] != '/')
                        return 0;
-               if (!S_ISDIR(entry->mode))
+               if (!S_ISDIR(entry->mode) && !S_ISGITLINK(entry->mode))
                        return 0;
        }
 
@@ -749,7 +749,7 @@ static enum interesting do_match(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