undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/add.c: use path_excluded()

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2012-06-05 21:44:22 -07:00
parent 782cd4c0f6
commit eb69934bbd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/add.c
View File

@ -441,6 +441,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (pathspec) { if (pathspec) {
int i; int i;
struct path_exclude_check check;
path_exclude_check_init(&check, &dir);
if (!seen) if (!seen)
seen = find_used_pathspec(pathspec); seen = find_used_pathspec(pathspec);
for (i = 0; pathspec[i]; i++) { 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])) { && !file_exists(pathspec[i])) {
if (ignore_missing) { if (ignore_missing) {
int dtype = DT_UNKNOWN; 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])); dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
} else } else
die(_("pathspec '%s' did not match any files"), 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); free(seen);
path_exclude_check_clear(&check);
} }
exit_status |= add_files_to_cache(prefix, pathspec, flags); exit_status |= add_files_to_cache(prefix, pathspec, flags);