diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-09-03 11:04:57 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-09-05 14:05:12 -0700 |
| commit | 65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4 (patch) | |
| tree | bd91b97a0abd9a03d446a8b5dbcc016bcef897c5 /builtin/check-ignore.c | |
| parent | treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' (diff) | |
| download | tgif-65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4.tar.xz | |
treewide: rename 'exclude' methods to 'pattern'
The first consumer of pattern-matching filenames was the
.gitignore feature. In that context, storing a list of patterns
as a 'struct exclude_list' makes sense. However, the
sparse-checkout feature then adopted these structures and methods,
but with the opposite meaning: these patterns match the files
that should be included!
It would be clearer to rename this entire library as a "pattern
matching" library, and the callers apply exclusion/inclusion
logic accordingly based on their needs.
This commit renames several methods defined in dir.h to make
more sense with the renamed 'struct exclude_list' to 'struct
pattern_list' and 'struct exclude' to 'struct path_pattern':
* last_exclude_matching() -> last_matching_pattern()
* parse_exclude() -> parse_path_pattern()
In addition, the word 'exclude' was replaced with 'pattern'
in the methods below:
* add_exclude_list()
* add_excludes_from_file_to_list()
* add_excludes_from_file()
* add_excludes_from_blob_to_list()
* add_exclude()
* clear_exclude_list()
A few methods with the word "exclude" remain. These will
be handled seperately. In particular, the method
"is_excluded()" is concretely about the .gitignore file
relative to a specific directory. This is the important
boundary between library and consumer: is_excluded() cares
about .gitignore, but is_excluded() calls
last_matching_pattern() to make that decision.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/check-ignore.c')
| -rw-r--r-- | builtin/check-ignore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 28b8f14999..5a4f92395f 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -106,7 +106,7 @@ static int check_ignore(struct dir_struct *dir, pattern = NULL; if (!seen[i]) { int dtype = DT_UNKNOWN; - pattern = last_exclude_matching(dir, &the_index, + pattern = last_matching_pattern(dir, &the_index, full_path, &dtype); } if (!quiet && (pattern || show_non_matching)) |