diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-04-08 17:41:25 -0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-08 14:18:03 -0700 |
| commit | 719630eb4826ff7f36bc060533dbccc3c96d151c (patch) | |
| tree | 56bf2c8141c856f5e926fbddaf48ad9df8658a85 /builtin/check-ignore.c | |
| parent | d73dbafc2c25eb45090d6aa9d56fc21b40c78083 (diff) | |
| download | git-719630eb4826ff7f36bc060533dbccc3c96d151c.tar.gz | |
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/check-ignore.c')
| -rw-r--r-- | builtin/check-ignore.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 3c652748d5..0f4480a11b 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -100,7 +100,8 @@ 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, &the_index); + seen = find_pathspecs_matching_against_index(&pathspec, &the_index, + PS_HEED_SKIP_WORKTREE); for (i = 0; i < pathspec.nr; i++) { full_path = pathspec.items[i].match; pattern = NULL; |