From: Derrick Stolee <derrickstolee@github.com>
To: Taylor Blau <me@ttaylorr.com>, git@vger.kernel.org
Cc: Victoria Dye <vdye@github.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/2] shortlog: introduce `--group-filter` to restrict output
Date: Thu, 8 Jun 2023 10:34:02 -0400 [thread overview]
Message-ID: <3778f07f-6e6f-5a39-631d-1266d61b9715@github.com> (raw)
In-Reply-To: <5cec04b65d350ca8b482ca14260ef118341e4039.1686178917.git.me@ttaylorr.com>
On 6/7/2023 7:02 PM, Taylor Blau wrote:
> This means that you could easily view the hashes of all commits you
> either wrote or co-authored with something like:
>
> $ git shortlog -n --group=author --group=trailer:Co-authored-by \
> --group-filter="$(git config user.name)"
>
> When filtering just by trailers, it is tempting to want to introduce a
> new grep mode for matching a given trailer, like `--author=<pattern>`
> for matching the author header. But this would not be suitable for the
> above, since we want commits which match either the author or the
> Co-authored-by trailer, not ones which match both.
One thing that is not immediately obvious from reading the patch, but
becomes clearer in patch 2, is that your --group-filter is an exact
string match. This differs from the --author filter in 'git log' and
similar, which is actually a case-insensitive substring match.
> +static int want_shortlog_group(struct shortlog *log, const char *group)
> +{
> + if (!log->group_filter.nr)
> + return 1;
> + return string_list_has_string(&log->group_filter, group);
> +}
> +
This is the critical piece of code for this issue. Replacing it with
static int want_shortlog_group(struct shortlog *log, const char *group)
{
struct string_list_item *item;
if (!log->group_filter.nr)
return 1;
for_each_string_list_item(item, &log->group_filter) {
if (strcasestr(group, item->string))
return 1;
}
return 0;
}
Results in the case-insensitive substring search that I would expect
from this parameter.
This would also solve the problem from Patch 2 where we want to search
by email address. Using '-e --group-filter="my@email.com"' works, though
it will catch users with 'tammy@email.com' emails, as well.
Something to consider at a high level before committing to this CLI.
Thanks,
-Stolee
next prev parent reply other threads:[~2023-06-08 14:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 23:02 [PATCH 0/2] shortlog: introduce --email-only, --group-filter options Taylor Blau
2023-06-07 23:02 ` [PATCH 1/2] shortlog: introduce `--group-filter` to restrict output Taylor Blau
2023-06-08 14:34 ` Derrick Stolee [this message]
2023-06-08 16:22 ` Taylor Blau
2023-06-07 23:02 ` [PATCH 2/2] shortlog: introduce `--email-only` to only show emails Taylor Blau
2023-06-08 7:35 ` Johannes Sixt
2023-06-08 16:24 ` Taylor Blau
2023-06-12 21:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3778f07f-6e6f-5a39-631d-1266d61b9715@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).