summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-05 21:44:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-05 21:44:22 -0700
commiteb69934bbd1200a318422c0d127c043d6b8457e1 (patch)
tree170e13a064c21895d2fc9cd047ae87067febdc19
parentpath_excluded(): update API to less cache-entry centric (diff)
downloadtgif-eb69934bbd1200a318422c0d127c043d6b8457e1.tar.xz
builtin/add.c: use path_excluded()
This only happens in --ignore-missing --dry-run codepath which presumably nobody should care, but is for completeness. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/add.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index c59b0c98fe..e5b40d9873 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);