diff options
| -rw-r--r-- | builtin/add.c | 4 | ||||
| -rw-r--r-- | pathspec.c | 17 | ||||
| -rw-r--r-- | pathspec.h | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/builtin/add.c b/builtin/add.c index e51ba441c..8c3fdf943 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -117,7 +117,7 @@ static char *prune_directory(struct dir_struct *dir, const char **pathspec, int *dst++ = entry; } dir->nr = dst - dir->entries; - fill_pathspec_matches(pathspec, seen, specs); + add_pathspec_matches_against_index(pathspec, seen, specs); return seen; } @@ -415,7 +415,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) path_exclude_check_init(&check, &dir); if (!seen) - seen = find_used_pathspec(pathspec); + seen = find_pathspecs_matching_against_index(pathspec); for (i = 0; pathspec[i]; i++) { if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i])) { diff --git a/pathspec.c b/pathspec.c index 1472af89c..b73b15cbb 100644 --- a/pathspec.c +++ b/pathspec.c @@ -13,9 +13,10 @@ * altogether if seen[] already only contains non-zero entries. * * If seen[] has not already been written to, it may make sense - * to use find_used_pathspec() instead. + * to use find_pathspecs_matching_against_index() instead. */ -void fill_pathspec_matches(const char **pathspec, char *seen, int specs) +void add_pathspec_matches_against_index(const char **pathspec, + char *seen, int specs) { int num_unmatched = 0, i; @@ -39,12 +40,12 @@ void fill_pathspec_matches(const char **pathspec, char *seen, int specs) /* * Finds which of the given pathspecs match items in the index. * - * This is a one-shot wrapper around fill_pathspec_matches() which - * allocates, populates, and returns a seen[] array indicating the - * nature of the "closest" (i.e. most specific) matches which each of - * the given pathspecs achieves against all items in the index. + * This is a one-shot wrapper around add_pathspec_matches_against_index() + * which allocates, populates, and returns a seen[] array indicating the + * nature of the "closest" (i.e. most specific) matches which each of the + * given pathspecs achieves against all items in the index. */ -char *find_used_pathspec(const char **pathspec) +char *find_pathspecs_matching_against_index(const char **pathspec) { char *seen; int i; @@ -52,6 +53,6 @@ char *find_used_pathspec(const char **pathspec) for (i = 0; pathspec[i]; i++) ; /* just counting */ seen = xcalloc(i, 1); - fill_pathspec_matches(pathspec, seen, i); + add_pathspec_matches_against_index(pathspec, seen, i); return seen; } diff --git a/pathspec.h b/pathspec.h index 1cb1909e4..3852bc062 100644 --- a/pathspec.h +++ b/pathspec.h @@ -1,7 +1,7 @@ #ifndef PATHSPEC_H #define PATHSPEC_H -extern char *find_used_pathspec(const char **pathspec); -extern void fill_pathspec_matches(const char **pathspec, char *seen, int specs); +extern char *find_pathspecs_matching_against_index(const char **pathspec); +extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs); #endif /* PATHSPEC_H */ |