diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2019-09-03 18:04:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-05 21:05:12 (GMT) |
| commit | 65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4 (patch) | |
| tree | bd91b97a0abd9a03d446a8b5dbcc016bcef897c5 /list-objects-filter.c | |
| parent | 4ff89ee52cd3cf6e38a11bb94e43df1b53c56eec (diff) | |
| download | git-65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4.zip git-65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4.tar.gz git-65edd96aecdee2cd4d16a7c17ae9f723c3fe61a4.tar.bz2 | |
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 'list-objects-filter.c')
| -rw-r--r-- | list-objects-filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects-filter.c b/list-objects-filter.c index a1fedf8..ccd58e6 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -482,7 +482,7 @@ static void filter_sparse_oid__init( struct filter *filter) { struct filter_sparse_data *d = xcalloc(1, sizeof(*d)); - if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value, + if (add_patterns_from_blob_to_list(filter_options->sparse_oid_value, NULL, 0, &d->pl) < 0) die("could not load filter specification"); |