зеркало из https://github.com/microsoft/git.git
ref-filter: add option to match literal pattern
Since 'ref-filter' only has an option to match path names add an option for plain fnmatch pattern-matching. This is to support the pattern matching options which are used in `git tag -l` and `git branch -l` where we can match patterns like `git tag -l foo*` which would match all tags which has a "foo*" pattern. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
90c004085c
Коммит
bef0e12bec
|
@ -68,6 +68,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
|
||||||
git_config(git_default_config, NULL);
|
git_config(git_default_config, NULL);
|
||||||
|
|
||||||
filter.name_patterns = argv;
|
filter.name_patterns = argv;
|
||||||
|
filter.match_as_path = 1;
|
||||||
filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
|
filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
|
||||||
ref_array_sort(sorting, &array);
|
ref_array_sort(sorting, &array);
|
||||||
|
|
||||||
|
|
40
ref-filter.c
40
ref-filter.c
|
@ -1159,11 +1159,35 @@ static int commit_contains(struct ref_filter *filter, struct commit *commit)
|
||||||
return is_descendant_of(commit, filter->with_commit);
|
return is_descendant_of(commit, filter->with_commit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return 1 if the refname matches one of the patterns, otherwise 0.
|
||||||
|
* A pattern can be a literal prefix (e.g. a refname "refs/heads/master"
|
||||||
|
* matches a pattern "refs/heads/mas") or a wildcard (e.g. the same ref
|
||||||
|
* matches "refs/heads/mas*", too).
|
||||||
|
*/
|
||||||
|
static int match_pattern(const char **patterns, const char *refname)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* When no '--format' option is given we need to skip the prefix
|
||||||
|
* for matching refs of tags and branches.
|
||||||
|
*/
|
||||||
|
(void)(skip_prefix(refname, "refs/tags/", &refname) ||
|
||||||
|
skip_prefix(refname, "refs/heads/", &refname) ||
|
||||||
|
skip_prefix(refname, "refs/remotes/", &refname) ||
|
||||||
|
skip_prefix(refname, "refs/", &refname));
|
||||||
|
|
||||||
|
for (; *patterns; patterns++) {
|
||||||
|
if (!wildmatch(*patterns, refname, 0, NULL))
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return 1 if the refname matches one of the patterns, otherwise 0.
|
* Return 1 if the refname matches one of the patterns, otherwise 0.
|
||||||
* A pattern can be path prefix (e.g. a refname "refs/heads/master"
|
* A pattern can be path prefix (e.g. a refname "refs/heads/master"
|
||||||
* matches a pattern "refs/heads/") or a wildcard (e.g. the same ref
|
* matches a pattern "refs/heads/" but not "refs/heads/m") or a
|
||||||
* matches "refs/heads/m*",too).
|
* wildcard (e.g. the same ref matches "refs/heads/m*", too).
|
||||||
*/
|
*/
|
||||||
static int match_name_as_path(const char **pattern, const char *refname)
|
static int match_name_as_path(const char **pattern, const char *refname)
|
||||||
{
|
{
|
||||||
|
@ -1184,6 +1208,16 @@ static int match_name_as_path(const char **pattern, const char *refname)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return 1 if the refname matches one of the patterns, otherwise 0. */
|
||||||
|
static int filter_pattern_match(struct ref_filter *filter, const char *refname)
|
||||||
|
{
|
||||||
|
if (!*filter->name_patterns)
|
||||||
|
return 1; /* No pattern always matches */
|
||||||
|
if (filter->match_as_path)
|
||||||
|
return match_name_as_path(filter->name_patterns, refname);
|
||||||
|
return match_pattern(filter->name_patterns, refname);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Given a ref (sha1, refname), check if the ref belongs to the array
|
* Given a ref (sha1, refname), check if the ref belongs to the array
|
||||||
* of sha1s. If the given ref is a tag, check if the given tag points
|
* of sha1s. If the given ref is a tag, check if the given tag points
|
||||||
|
@ -1286,7 +1320,7 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
|
||||||
if (!(kind & filter->kind))
|
if (!(kind & filter->kind))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))
|
if (!filter_pattern_match(filter, refname))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (filter->points_at.nr && !match_points_at(&filter->points_at, oid->hash, refname))
|
if (filter->points_at.nr && !match_points_at(&filter->points_at, oid->hash, refname))
|
||||||
|
|
|
@ -59,7 +59,8 @@ struct ref_filter {
|
||||||
} merge;
|
} merge;
|
||||||
struct commit *merge_commit;
|
struct commit *merge_commit;
|
||||||
|
|
||||||
unsigned int with_commit_tag_algo : 1;
|
unsigned int with_commit_tag_algo : 1,
|
||||||
|
match_as_path : 1;
|
||||||
unsigned int kind,
|
unsigned int kind,
|
||||||
lines;
|
lines;
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче