kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Brandon Williams 2017-05-11 15:04:27 -07:00 committed by Junio C Hamano
parent 2249d4dbc1
commit 08de9151a8
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/add.c
View File

@ -136,7 +136,7 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec,
*dst++ = entry; *dst++ = entry;
} }
dir->nr = dst - dir->entries; dir->nr = dst - dir->entries;
add_pathspec_matches_against_index(pathspec, seen); add_pathspec_matches_against_index(pathspec, &the_index, seen);
return seen; return seen;
} }


@ -418,7 +418,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int i; int i;


if (!seen) if (!seen)
seen = find_pathspecs_matching_against_index(&pathspec); seen = find_pathspecs_matching_against_index(&pathspec, &the_index);


/* /*
* file_exists() assumes exact match * file_exists() assumes exact match

2
builtin/check-ignore.c
View File

@ -98,7 +98,7 @@ static int check_ignore(struct dir_struct *dir,
* should not be ignored, in order to be consistent with * should not be ignored, in order to be consistent with
* 'git status', 'git add' etc. * '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++) { for (i = 0; i < pathspec.nr; i++) {
full_path = pathspec.items[i].match; full_path = pathspec.items[i].match;
exclude = NULL; exclude = NULL;

11
pathspec.c
View File

@ -1,3 +1,4 @@
#define NO_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h" #include "cache.h"
#include "dir.h" #include "dir.h"
#include "pathspec.h" #include "pathspec.h"
@ -17,6 +18,7 @@
* to use find_pathspecs_matching_against_index() instead. * to use find_pathspecs_matching_against_index() instead.
*/ */
void add_pathspec_matches_against_index(const struct pathspec *pathspec, void add_pathspec_matches_against_index(const struct pathspec *pathspec,
const struct index_state *istate,
char *seen) char *seen)
{ {
int num_unmatched = 0, i; int num_unmatched = 0, i;
@ -32,8 +34,8 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
num_unmatched++; num_unmatched++;
if (!num_unmatched) if (!num_unmatched)
return; return;
for (i = 0; i < active_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
const struct cache_entry *ce = active_cache[i]; const struct cache_entry *ce = istate->cache[i];
ce_path_match(ce, pathspec, seen); ce_path_match(ce, pathspec, seen);
} }
} }
@ -46,10 +48,11 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
* nature of the "closest" (i.e. most specific) matches which each of the * nature of the "closest" (i.e. most specific) matches which each of the
* given pathspecs achieves against all items in the index. * given pathspecs achieves against all items in the index.
*/ */
char *find_pathspecs_matching_against_index(const struct pathspec *pathspec) char *find_pathspecs_matching_against_index(const struct pathspec *pathspec,
const struct index_state *istate)
{ {
char *seen = xcalloc(pathspec->nr, 1); char *seen = xcalloc(pathspec->nr, 1);
add_pathspec_matches_against_index(pathspec, seen); add_pathspec_matches_against_index(pathspec, istate, seen);
return seen; return seen;
} }



7
pathspec.h
View File

@ -96,7 +96,10 @@ static inline int ps_strcmp(const struct pathspec_item *item,
return strcmp(s1, s2); return strcmp(s1, s2);
} }


extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec); extern void add_pathspec_matches_against_index(const struct pathspec *pathspec,
extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen); const struct index_state *istate,
char *seen);
extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec,
const struct index_state *istate);


#endif /* PATHSPEC_H */ #endif /* PATHSPEC_H */