Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'

diff --git a/dir.c b/dir.c
index ab6477d777e96cb9789f1c6b3220af349731a701..21284482198147687fb03892265f97ac5ed58d18 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -276,44 +276,6 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
 #define DO_MATCH_DIRECTORY (1<<1)
 #define DO_MATCH_SUBMODULE (1<<2)
 
-static int match_attrs(const struct index_state *istate,
-                      const char *name, int namelen,
-                      const struct pathspec_item *item)
-{
-       int i;
-       char *to_free = NULL;
-
-       if (name[namelen])
-               name = to_free = xmemdupz(name, namelen);
-
-       git_check_attr(istate, name, item->attr_check);
-
-       free(to_free);
-
-       for (i = 0; i < item->attr_match_nr; i++) {
-               const char *value;
-               int matched;
-               enum attr_match_mode match_mode;
-
-               value = item->attr_check->items[i].value;
-               match_mode = item->attr_match[i].match_mode;
-
-               if (ATTR_TRUE(value))
-                       matched = (match_mode == MATCH_SET);
-               else if (ATTR_FALSE(value))
-                       matched = (match_mode == MATCH_UNSET);
-               else if (ATTR_UNSET(value))
-                       matched = (match_mode == MATCH_UNSPECIFIED);
-               else
-                       matched = (match_mode == MATCH_VALUE &&
-                                  !strcmp(item->attr_match[i].value, value));
-               if (!matched)
-                       return 0;
-       }
-
-       return 1;
-}
-
 /*
  * Does 'match' match the given name?
  * A match is found if
@@ -367,7 +329,8 @@ static int match_pathspec_item(const struct index_state *istate,
            strncmp(item->match, name - prefix, item->prefix))
                return 0;
 
-       if (item->attr_match_nr && !match_attrs(istate, name, namelen, item))
+       if (item->attr_match_nr &&
+           !match_pathspec_attrs(istate, name, namelen, item))
                return 0;
 
        /* If the match was just the prefix, we matched */