From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, me@ttaylorr.com,
vdye@github.com, steadmon@google.com,
Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH 1/3] refs: allow "HEAD" as decoration filter
Date: Tue, 26 Jul 2022 17:10:28 +0200 [thread overview]
Message-ID: <220726.86lesfnc0y.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <c2e5a0b3a50237f3b7f5ceb5d05faa83fd41de68.1658844250.git.gitgitgadget@gmail.com>
On Tue, Jul 26 2022, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee <derrickstolee@github.com>
>
> The normalize_glob_ref() method was introduced in 65516f586b693 (log:
> add option to choose which refs to decorate, 2017-11-21) to help with
> decoration filters such as --decorate-refs=<filter> and
> --decorate-refs-exclude=<filter>. The method has not been used anywhere
> else.
>
> At the moment, it is impossible to specify HEAD as a decoration filter
> since normalize_glob_ref() prepends "refs/" to the filter if it isn't
> already there.
>
> Allow adding HEAD as a decoration filter by allowing the exact string
> "HEAD" to not be prepended with "refs/". Add a test in t4202-log.sh that
> would previously fail since the HEAD decoration would exist in the
> output.
>
> It is sufficient to only cover "HEAD" here and not include other special
> refs like REBASE_HEAD. This is because HEAD is the only ref outside of
> refs/* that is added to the list of decorations.
>
> Signed-off-by: Derrick Stolee <derrickstolee@github.com>
> ---
> refs.c | 4 ++--
> t/t4202-log.sh | 6 ++++++
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 90bcb271687..ec3134e4842 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -457,8 +457,8 @@ void normalize_glob_ref(struct string_list_item *item, const char *prefix,
>
> if (prefix) {
> strbuf_addstr(&normalized_pattern, prefix);
> - }
> - else if (!starts_with(pattern, "refs/"))
> + } else if (!starts_with(pattern, "refs/") &&
> + strcmp(pattern, "HEAD"))
> strbuf_addstr(&normalized_pattern, "refs/");
Arguably a digression for this series, but I think it would be very nice
to have a pre-step where we'd create some pre-step to centrally declare
these magical refs in some struct whose flags would cover these various
cases.
E.g. we have this hardcoded in should_autocreate_reflog(), in log-tree.c
(which AFAICT is the reference to "HEAD" here), refs.c etc. etc.
next prev parent reply other threads:[~2022-07-26 15:12 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-26 14:04 [PATCH 0/3] log: create tighter default decoration filter Derrick Stolee via GitGitGadget
2022-07-26 14:04 ` [PATCH 1/3] refs: allow "HEAD" as " Derrick Stolee via GitGitGadget
2022-07-26 15:10 ` Ævar Arnfjörð Bjarmason [this message]
2022-07-29 13:23 ` Derrick Stolee
2022-07-26 14:04 ` [PATCH 2/3] log: add default " Derrick Stolee via GitGitGadget
2022-07-26 14:39 ` Ævar Arnfjörð Bjarmason
2022-07-29 13:25 ` Derrick Stolee
2022-07-26 15:04 ` Ævar Arnfjörð Bjarmason
2022-07-27 14:50 ` Junio C Hamano
2022-07-27 19:07 ` Derrick Stolee
2022-07-27 19:38 ` Junio C Hamano
2022-07-29 20:32 ` Jeff King
2022-07-26 14:04 ` [PATCH 3/3] maintenance: stop writing log.excludeDecoration Derrick Stolee via GitGitGadget
2022-07-27 14:50 ` Junio C Hamano
2022-07-26 14:44 ` [PATCH 0/3] log: create tighter default decoration filter Ævar Arnfjörð Bjarmason
2022-07-26 16:38 ` Derrick Stolee
2022-07-26 18:19 ` Ævar Arnfjörð Bjarmason
2022-07-27 13:41 ` Derrick Stolee
2022-07-27 20:40 ` Ævar Arnfjörð Bjarmason
2022-07-29 19:29 ` [PATCH v2 00/10] " Derrick Stolee via GitGitGadget
2022-07-29 19:29 ` [PATCH v2 01/10] refs: allow "HEAD" as " Derrick Stolee via GitGitGadget
2022-08-03 6:03 ` Junio C Hamano
2022-08-04 13:22 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 02/10] t4207: test coloring of grafted decorations Derrick Stolee via GitGitGadget
2022-08-03 6:25 ` Ævar Arnfjörð Bjarmason
2022-08-03 6:44 ` Eric Sunshine
2022-08-03 13:03 ` Ævar Arnfjörð Bjarmason
2022-08-04 4:05 ` Eric Sunshine
2022-08-04 17:23 ` Junio C Hamano
2022-08-05 14:21 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 03/10] refs: add array of ref namespaces Derrick Stolee via GitGitGadget
2022-08-03 6:16 ` Junio C Hamano
2022-08-04 13:29 ` Derrick Stolee
2022-08-04 16:16 ` Junio C Hamano
2022-08-03 22:39 ` Josh Steadmon
2022-08-04 13:29 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 04/10] refs: use ref_namespaces for replace refs base Derrick Stolee via GitGitGadget
2022-08-03 22:38 ` Josh Steadmon
2022-08-04 13:30 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 05/10] log-tree: use ref_namespaces instead of if/else-if Derrick Stolee via GitGitGadget
2022-08-03 6:31 ` Junio C Hamano
2022-08-04 13:31 ` Derrick Stolee
2022-08-04 14:34 ` Derrick Stolee
2022-08-04 14:50 ` Derrick Stolee
2022-08-04 17:40 ` Junio C Hamano
2022-08-04 20:17 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 06/10] log: add default decoration filter Derrick Stolee via GitGitGadget
2022-08-04 7:08 ` Ævar Arnfjörð Bjarmason
2022-08-05 14:27 ` Derrick Stolee
2022-08-05 14:50 ` Ævar Arnfjörð Bjarmason
2022-08-05 15:09 ` Derrick Stolee
2022-08-11 19:30 ` Ævar Arnfjörð Bjarmason
2022-08-12 19:37 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 07/10] log: add --decorate-all option Derrick Stolee via GitGitGadget
2022-08-04 16:57 ` Junio C Hamano
2022-07-29 19:29 ` [PATCH v2 08/10] log: create log.decorateFilter=all Derrick Stolee via GitGitGadget
2022-08-03 22:42 ` Josh Steadmon
2022-08-04 13:38 ` Derrick Stolee
2022-07-29 19:29 ` [PATCH v2 09/10] maintenance: stop writing log.excludeDecoration Derrick Stolee via GitGitGadget
2022-08-03 6:36 ` Junio C Hamano
2022-07-29 19:29 ` [PATCH v2 10/10] fetch: use ref_namespaces during prefetch Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 00/11] log: create tighter default decoration filter Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 01/11] refs: allow "HEAD" as " Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 02/11] t4207: modernize test Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 03/11] t4207: test coloring of grafted decorations Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 04/11] refs: add array of ref namespaces Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 05/11] refs: use ref_namespaces for replace refs base Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 06/11] log-tree: use ref_namespaces instead of if/else-if Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 07/11] log: add default decoration filter Derrick Stolee via GitGitGadget
2022-09-08 21:13 ` Glen Choo
2022-09-09 12:23 ` Derrick Stolee
2022-09-09 16:19 ` Junio C Hamano
2022-09-09 16:40 ` Derrick Stolee
2022-09-09 17:41 ` Junio C Hamano
2022-09-09 17:12 ` Glen Choo
2022-08-05 17:58 ` [PATCH v3 08/11] log: add --clear-decorations option Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 09/11] log: create log.initialDecorationSet=all Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 10/11] maintenance: stop writing log.excludeDecoration Derrick Stolee via GitGitGadget
2022-08-05 17:58 ` [PATCH v3 11/11] fetch: use ref_namespaces during prefetch Derrick Stolee via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220726.86lesfnc0y.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=steadmon@google.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).