Merge branch 'en/clean-cleanups'

[thirdparty/git.git] / dir.c

diff --git a/dir.c b/dir.c
index a3ad9702d646649477a37ce94a1f3b6c22e27f21..1045cc9c6f58702aba6e9036a8bce91a431c108a 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -368,7 +368,8 @@ static int match_pathspec_item(const struct index_state *istate,
                return MATCHED_FNMATCH;
 
        /* Perform checks to see if "name" is a leading string of the pathspec */
-       if (flags & DO_MATCH_LEADING_PATHSPEC) {
+       if ( (flags & DO_MATCH_LEADING_PATHSPEC) &&
+           !(flags & DO_MATCH_EXCLUDE)) {
                /* name is a literal prefix of the pathspec */
                int offset = name[namelen-1] == '/' ? 1 : 0;
                if ((namelen < matchlen) &&
@@ -405,6 +406,10 @@ static int match_pathspec_item(const struct index_state *istate,
 }
 
 /*
+ * do_match_pathspec() is meant to ONLY be called by
+ * match_pathspec_with_flags(); calling it directly risks pathspecs
+ * like ':!unwanted_path' being ignored.
+ *
  * Given a name and a list of pathspecs, returns the nature of the
  * closest (i.e. most specific) match of the name to any of the
  * pathspecs.
@@ -490,13 +495,12 @@ static int do_match_pathspec(const struct index_state *istate,
        return retval;
 }
 
-int match_pathspec(const struct index_state *istate,
-                  const struct pathspec *ps,
-                  const char *name, int namelen,
-                  int prefix, char *seen, int is_dir)
+static int match_pathspec_with_flags(const struct index_state *istate,
+                                    const struct pathspec *ps,
+                                    const char *name, int namelen,
+                                    int prefix, char *seen, unsigned flags)
 {
        int positive, negative;
-       unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
        positive = do_match_pathspec(istate, ps, name, namelen,
                                     prefix, seen, flags);
        if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
@@ -507,6 +511,16 @@ int match_pathspec(const struct index_state *istate,
        return negative ? 0 : positive;
 }
 
+int match_pathspec(const struct index_state *istate,
+                  const struct pathspec *ps,
+                  const char *name, int namelen,
+                  int prefix, char *seen, int is_dir)
+{
+       unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
+       return match_pathspec_with_flags(istate, ps, name, namelen,
+                                        prefix, seen, flags);
+}
+
 /**
  * Check if a submodule is a superset of the pathspec
  */
@@ -515,11 +529,11 @@ int submodule_path_match(const struct index_state *istate,
                         const char *submodule_name,
                         char *seen)
 {
-       int matched = do_match_pathspec(istate, ps, submodule_name,
-                                       strlen(submodule_name),
-                                       0, seen,
-                                       DO_MATCH_DIRECTORY |
-                                       DO_MATCH_LEADING_PATHSPEC);
+       int matched = match_pathspec_with_flags(istate, ps, submodule_name,
+                                               strlen(submodule_name),
+                                               0, seen,
+                                               DO_MATCH_DIRECTORY |
+                                               DO_MATCH_LEADING_PATHSPEC);
        return matched;
 }
 
@@ -1761,9 +1775,11 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
         * for matching patterns.
         */
        if (pathspec && !excluded) {
-               matches_how = do_match_pathspec(istate, pathspec, dirname, len,
-                                               0 /* prefix */, NULL /* seen */,
-                                               DO_MATCH_LEADING_PATHSPEC);
+               matches_how = match_pathspec_with_flags(istate, pathspec,
+                                                       dirname, len,
+                                                       0 /* prefix */,
+                                                       NULL /* seen */,
+                                                       DO_MATCH_LEADING_PATHSPEC);
                if (!matches_how)
                        return path_none;
        }
@@ -2196,9 +2212,9 @@ static enum path_treatment treat_path(struct dir_struct *dir,
                if (excluded)
                        return path_excluded;
                if (pathspec &&
-                   !do_match_pathspec(istate, pathspec, path->buf, path->len,
-                                      0 /* prefix */, NULL /* seen */,
-                                      0 /* flags */))
+                   !match_pathspec(istate, pathspec, path->buf, path->len,
+                                   0 /* prefix */, NULL /* seen */,
+                                   0 /* is_dir */))
                        return path_none;
                return path_untracked;
        }