From: Junio C Hamano <gitster@pobox.com>
To: Andy Koppe <andy.koppe@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] pretty: fix ref filtering for %(decorate) formats
Date: Mon, 09 Oct 2023 11:24:05 -0700 [thread overview]
Message-ID: <xmqq4jiz1woq.fsf@gitster.g> (raw)
In-Reply-To: <20231008202307.1568477-1-andy.koppe@gmail.com> (Andy Koppe's message of "Sun, 8 Oct 2023 21:23:07 +0100")
Andy Koppe <andy.koppe@gmail.com> writes:
> Mark pretty formats containing "%(decorate" as requiring decoration in
> userformat_find_requirements(), same as "%d" and "%D".
Ah, of course. The patch makes sense.
> diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
> index 16626e4fe9..5aabc9f7d8 100755
> --- a/t/t4205-log-pretty-formats.sh
> +++ b/t/t4205-log-pretty-formats.sh
> @@ -590,9 +590,9 @@ test_expect_success 'pretty format %decorate' '
> git log --format="%(decorate:prefix=,suffix=)" -1 >actual2 &&
> test_cmp expect2 actual2 &&
>
> - echo "[ HEAD -> foo; tag: bar; qux ]" >expect3 &&
> - git log --format="%(decorate:prefix=[ ,suffix= ],separator=%x3B )" \
> - -1 >actual3 &&
> + echo "[ bar; qux; foo ]" >expect3 &&
> + git log --format="%(decorate:prefix=[ ,suffix= ],separator=%x3B ,tag=)" \
> + --decorate-refs=refs/ -1 >actual3 &&
> test_cmp expect3 actual3 &&
The original test shares the same, but is the order of multiple
decorations expected to be stable? I feel a bit uneasy to see a
test that insists multiple things come out in a hardcoded order.
It is not making anything _worse_, so let's take the patch as-is.
Thanks.
> # Try with a typo (in "separator"), in which case the placeholder should
prev parent reply other threads:[~2023-10-09 18:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-08 20:23 [PATCH] pretty: fix ref filtering for %(decorate) formats Andy Koppe
2023-10-09 18:24 ` Junio C Hamano [this message]
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=xmqq4jiz1woq.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andy.koppe@gmail.com \
--cc=git@vger.kernel.org \
/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).