From: Junio C Hamano Date: Wed, 06 Jun 2012 05:45:17 GMT Subject: [PATCH 4/6] builtin/add.c: use path_excluded() Message-ID: <1338961519-30970-5-git-send-email-gitster@pobox.com> In-Reply-To: <1338961519-30970-1-git-send-email-gitster@pobox.com> This only happens in --ignore-missing --dry-run codepath which presumably nobody should care, but is for completeness. Signed-off-by: Junio C Hamano --- builtin/add.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/add.c b/builtin/add.c index c59b0c9..e5b40d9 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -441,6 +441,9 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (pathspec) { int i; + struct path_exclude_check check; + + path_exclude_check_init(&check, &dir); if (!seen) seen = find_used_pathspec(pathspec); for (i = 0; pathspec[i]; i++) { @@ -448,7 +451,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) && !file_exists(pathspec[i])) { if (ignore_missing) { int dtype = DT_UNKNOWN; - if (excluded(&dir, pathspec[i], &dtype)) + if (path_excluded(&check, pathspec[i], -1, &dtype)) dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); } else die(_("pathspec '%s' did not match any files"), @@ -456,6 +459,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) } } free(seen); + path_exclude_check_clear(&check); } exit_status |= add_files_to_cache(prefix, pathspec, flags); -- 1.7.11.rc1.37.g09843ac