Re: [RFC/PATCH 5/9] ref-filter: add option to match literal pattern
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Jun 30, 2015, 13:36 UTC
- Message-ID
- <CAOLa=ZSfpjumz6Cu7O3DF8vmVGofpibiJmpPo4irjn32f9WHxg@mail.gmail.com>
- In-Reply-To
- <xmqqy4j29y0o.fsf@gitster.dls.corp.google.com>
On Mon, Jun 29, 2015 at 11:50 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> Karthik Nayak <karthik.188@gmail.com> writes: > >> Since 'ref-filter' only has an option to match path names. > > That is not a whole sentence ;-) >
Argh! Noted.
Show 15 quoted lines
>> 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>
>
>> - if (flag & REF_BAD_NAME) {
>> - warning("ignoring ref with broken name %s", refname);
>> - return 0;
>> - }
>> -
>
> Hmm, where did this check go in the new code? Or is it now OK not
> to warn or ignore, and if so why?
>Merge conflict, I've replied with a fixing patch, shouldn't be there in the next version :)
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;
>
> Lose SP on both sides of the colon, or have SP on both sides
> (same for the last patch in the previous series).Will Do!
Thanks for the quick review.
-- Regards, Karthik Nayak