diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-04-08 23:41:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-09 00:18:03 +0300 |
| commit | 719630eb4826ff7f36bc060533dbccc3c96d151c (patch) | |
| tree | 56bf2c8141c856f5e926fbddaf48ad9df8658a85 /builtin/add.c | |
| parent | d73dbafc2c25eb45090d6aa9d56fc21b40c78083 (diff) | |
pathspec: allow to ignore SKIP_WORKTREE entries on index matching
Add a new enum parameter to `add_pathspec_matches_against_index()` and
`find_pathspecs_matching_against_index()`, allowing callers to specify
whether these function should attempt to match SKIP_WORKTREE entries or
not. This will be used in a future patch to make `git add` display a
warning when it is asked to update SKIP_WORKTREE entries.
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c index 5fec21a792..050cb8af30 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -177,7 +177,8 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, *dst++ = entry; } dir->nr = dst - dir->entries; - add_pathspec_matches_against_index(pathspec, &the_index, seen); + add_pathspec_matches_against_index(pathspec, &the_index, seen, + PS_HEED_SKIP_WORKTREE); return seen; } @@ -578,7 +579,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) int i; if (!seen) - seen = find_pathspecs_matching_against_index(&pathspec, &the_index); + seen = find_pathspecs_matching_against_index(&pathspec, + &the_index, PS_HEED_SKIP_WORKTREE); /* * file_exists() assumes exact match |