Skip to content

Commit

Permalink
pathspec.c: rename newly public functions for clarity
Browse files Browse the repository at this point in the history
Perform the following function renames to make it explicit that these
pathspec handling functions are for matching against the index, rather
than against a tree or the working directory.

- fill_pathspec_matches() -> add_pathspec_matches_against_index()
- find_used_pathspec() -> find_pathspecs_matching_against_index()

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Adam Spiers authored and Junio C Hamano committed Jan 6, 2013
1 parent 6f525e7 commit 4b78d7b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions builtin/add.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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])) {
Expand Down
17 changes: 9 additions & 8 deletions pathspec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -39,19 +40,19 @@ 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;

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;
}
4 changes: 2 additions & 2 deletions pathspec.h
Original file line number Diff line number Diff line change
@@ -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 */

0 comments on commit 4b78d7b

Please sign in to comment.