git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH 5/9] ref-filter: add option to match literal pattern

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jun 26, 2015, 21:15 UTC
Message-ID
<558DC0EB.3050203@gmail.com>
In-Reply-To
<1435232596-27466-5-git-send-email-karthik.188@gmail.com>
Just a few things I need to fix, personal note.
On 06/25/2015 05:13 PM, Karthik Nayak wrote:
Show 57 quoted lines
> Since 'ref-filter' only has an option to match path names.
> Add an option for regular pattern matching.
>
> 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>
> ---
>   builtin/for-each-ref.c |  1 +
>   ref-filter.c           | 30 ++++++++++++++++++++++++------
>   ref-filter.h           |  3 ++-
>   3 files changed, 27 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
> index c318e33..01d5363 100644
> --- a/builtin/for-each-ref.c
> +++ b/builtin/for-each-ref.c
> @@ -68,6 +68,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
>   	git_config(git_default_config, NULL);
>
>   	filter.name_patterns = argv;
> +	filter.match_as_path = 1;
>   	filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
>   	ref_array_sort(sorting, &array);
>
> diff --git a/ref-filter.c b/ref-filter.c
> index e307fab..1f97910 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -954,6 +954,20 @@ static int commit_contains(struct ref_filter *filter, struct commit *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/m") or a wildcard (e.g. the same ref
> + * matches "refs/heads/m*",too).
> + */
> +static int match_pattern(const char **patterns, const char *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.
>    * 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 "refs/heads/m*",too).
> @@ -977,6 +991,15 @@ static int match_name_as_path(const char **pattern, const char *refname)
>   	return 0;
>   }
>
> +static int filter_pattern_match(struct ref_filter *filter, const char *refname)
> +{
> +	if (!*filter->name_patterns)
> +		return 0;
Should return 1.
Show 17 quoted lines
> +	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) see if it points to one of the sha1s
>    * in a sha1_array.
> @@ -1026,17 +1049,12 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
>   	struct ref_array_item *ref;
>   	struct commit *commit = NULL;
>
> -	if (flag & REF_BAD_NAME) {
> -		  warning("ignoring ref with broken name %s", refname);
> -		  return 0;
> -	}
> -
Undo this merge conflict.
Show 25 quoted lines
>   	if (flag & REF_ISBROKEN) {
>   		warning("ignoring broken ref %s", refname);
>   		return 0;
>   	}
>
> -	if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))
> +	if (!filter_pattern_match(filter, refname))
>   		return 0;
>
>   	if (!match_points_at(&filter->points_at, oid->hash, refname))
> diff --git a/ref-filter.h b/ref-filter.h
> index 6b6fb96..a4809c8 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -54,7 +54,8 @@ struct ref_filter {
>   	} merge;
>   	struct commit *merge_commit;
>
> -	unsigned int with_commit_tag_algo: 1;
> +	unsigned int with_commit_tag_algo: 1,
> +		match_as_path: 1;
>   	unsigned int lines;
>   };
>
>
I'll add these changes to my local branch.
-- 
Regards,
Karthik
Previous: Karthik NayakNext: Junio C Hamano
Message 9 of 23 in “port tag.c to use ref-filter library”
  1. 0/9 port tag.c to use ref-filter libraryKarthik Nayak, Jun 25, 2015
  2. 1/9 ref-filter: add %(refname:lalignX) optionKarthik Nayak, Jun 25, 2015
  3. 2/9 ref-filter: add option to filter only tagsKarthik Nayak, Jun 25, 2015
  4. 3/9 ref-filter: support printing N lines from tag annotationKarthik Nayak, Jun 25, 2015
  5. 4/9 ref-filter: add support to sort by versionKarthik Nayak, Jun 25, 2015
  6. Duy NguyenJul 12, 2015
  7. Karthik NayakJul 12, 2015
  8. 5/9 ref-filter: add option to match literal patternKarthik Nayak, Jun 25, 2015
  9. Karthik NayakJun 26, 2015
  10. Junio C HamanoJun 29, 2015
  11. Karthik NayakJun 30, 2015
  12. 6/9 tag.c: use 'ref-filter' data structuresKarthik Nayak, Jun 25, 2015
  13. 7/9 tag.c: use 'ref-filter' APIsKarthik Nayak, Jun 25, 2015
  14. 8/9 tag.c: implement '--format' optionKarthik Nayak, Jun 25, 2015
  15. 8/9 tag.c: implement '--format' optionKarthik Nayak, Jun 25, 2015
  16. 9/9 tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jun 25, 2015
  17. Christian CouderJun 27, 2015
  18. Christian CouderJun 28, 2015
  19. Karthik NayakJun 28, 2015
  20. Duy NguyenJun 27, 2015
  21. Junio C HamanoJun 28, 2015
  22. Karthik NayakJun 28, 2015
  23. Junio C HamanoJun 29, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.