dir: fix COLLECT_IGNORED on excluded prefixes

As we walk the directory tree, if we see an ignored path, we want to add it to the ignored list only if it matches any pathspec that we were given. We used to check for the pathspec to appear explicitly. E.g., if we see "subdir/file" and it is excluded, we check to see if we have "subdir/file" in our pathspec. However, this interacts badly with the optimization to avoid recursing into ignored subdirectories. If "subdir" as a whole is ignored, then we never recurse, and consider only whether "subdir" itself is in our pathspec. It would not match a pathspec of "subdir/file" explicitly, even though it is the reason that subdir/file would be excluded. This manifests itself to the user as "git add subdir/file" failing to correctly note that the pathspec was ignored. This patch extends the in_pathspec logic to include prefix directory case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 11, 2010 at 02:15 UTC 29209cbe58e7a977ae7267b11da19250b6878028

1 file changed +18 -2

dir.c

+18 -2

@@ -554,13 +554,29 @@ static int simplify_away(const char *path, int pathlen, const struct path_simpli

554 return 0;

555 }

556

557 -static int in_pathspec(const char *path, int len, const struct path_simplify *simplify)

557 +/*

558 + * This function tells us whether an excluded path matches a

559 + * list of "interesting" pathspecs. That is, whether a path matched

560 + * by any of the pathspecs could possibly be ignored by excluding

561 + * the specified path. This can happen if:

562 + *

563 + * 1. the path is mentioned explicitly in the pathspec

564 + *

565 + * 2. the path is a directory prefix of some element in the

566 + * pathspec

567 + */

568 +static int exclude_matches_pathspec(const char *path, int len,

569 + const struct path_simplify *simplify)

570 {

571 if (simplify) {

572 for (; simplify->path; simplify++) {

573 if (len == simplify->len

574 && !memcmp(path, simplify->path, len))

575 return 1;

576 + if (len < simplify->len

577 + && simplify->path[len] == '/'

578 + && !memcmp(path, simplify->path, len))

579 + return 1;

580 }

581 }

582 return 0;

@@ -638,7 +654,7 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,

654 {

655 int exclude = excluded(dir, path, &dtype);

656 if (exclude && (dir->flags & DIR_COLLECT_IGNORED)

641 - && in_pathspec(path, *len, simplify))

657 + && exclude_matches_pathspec(path, *len, simplify))

658 dir_add_ignored(dir, path, *len);

659

660 /*