diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-12 01:04:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-12 08:23:46 +0300 |
| commit | 08de9151a8a67f29a3a5a36931298237d78ca736 (patch) | |
| tree | e592ee783330d7e4f73315706f56a9cf46a15857 /builtin | |
| parent | 2249d4dbc197d45da5407cbc80b2461e49bb8785 (diff) | |
pathspec: convert find_pathspecs_matching_against_index to take an index
Convert find_pathspecs_matching_against_index to take an index
parameter.
In addition mark pathspec.c with NO_THE_INDEX_COMPATIBILITY_MACROS now
that it doesn't use any cache macros or reference 'the_index'.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 4 | ||||
| -rw-r--r-- | builtin/check-ignore.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/add.c b/builtin/add.c index 86770d6af4..0365a52098 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -136,7 +136,7 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, *dst++ = entry; } dir->nr = dst - dir->entries; - add_pathspec_matches_against_index(pathspec, seen); + add_pathspec_matches_against_index(pathspec, &the_index, seen); return seen; } @@ -418,7 +418,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) int i; if (!seen) - seen = find_pathspecs_matching_against_index(&pathspec); + seen = find_pathspecs_matching_against_index(&pathspec, &the_index); /* * file_exists() assumes exact match diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 91040a4b04..7629018a56 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -98,7 +98,7 @@ static int check_ignore(struct dir_struct *dir, * should not be ignored, in order to be consistent with * 'git status', 'git add' etc. */ - seen = find_pathspecs_matching_against_index(&pathspec); + seen = find_pathspecs_matching_against_index(&pathspec, &the_index); for (i = 0; i < pathspec.nr; i++) { full_path = pathspec.items[i].match; exclude = NULL; |