From: Junio C Hamano <gitster@pobox.com>
To: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
ZheNing Hu <adlternative@gmail.com>
Subject: Re: [PATCH v4] [GSOC] ref-filter: fix read invalid union member bug
Date: Tue, 11 May 2021 11:29:00 +0900 [thread overview]
Message-ID: <xmqqcztyovf7.fsf@gitster.g> (raw)
In-Reply-To: <pull.949.v4.git.1620658904283.gitgitgadget@gmail.com> (ZheNing Hu via GitGitGadget's message of "Mon, 10 May 2021 15:01:43 +0000")
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Change from last version:
> Prove that the bug may appear when using %(color) atom. And add
> corresponding test for it.
> ++test_expect_success '%(color:#aa22ac) must success' '
s/success/succeed/
But more importantly, I am not sure how this is supposed to
demonstrate existing breakage around the %(push). Did you mean to
use %(push) instead of %(refname) or something?
> ++ cat >expect <<-\EOF &&
> ++ refs/heads/main
> ++ refs/heads/side
> ++ refs/odd/spot
> ++ refs/tags/annotated-tag
> ++ refs/tags/doubly-annotated-tag
> ++ refs/tags/doubly-signed-tag
> ++ refs/tags/four
> ++ refs/tags/one
> ++ refs/tags/signed-tag
> ++ refs/tags/three
> ++ refs/tags/two
> ++ EOF
> ++ git for-each-ref --format="%(color:#aa22ac)%(refname)" >actual &&
> ++ test_cmp expect actual
> ++'
> ++
> + test_expect_success 'left alignment is default' '
> + cat >expect <<-\EOF &&
> + refname is refs/heads/main |refs/heads/main
>
>
> ref-filter.c | 2 +-
> t/t6302-for-each-ref-filter.sh | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index a0adb4551d87..213d3773ada3 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1730,7 +1730,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
> else
> v->s = xstrdup("");
> continue;
> - } else if (atom->u.remote_ref.push) {
> + } else if (!strcmp(atom->name, "push") || starts_with(atom->name, "push:")) {
> const char *branch_name;
> v->s = xstrdup("");
> if (!skip_prefix(ref->refname, "refs/heads/",
> diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
> index 9866b1b57368..38a7d83830aa 100755
> --- a/t/t6302-for-each-ref-filter.sh
> +++ b/t/t6302-for-each-ref-filter.sh
> @@ -117,6 +117,24 @@ test_expect_success '%(color) must fail' '
> test_must_fail git for-each-ref --format="%(color)%(refname)"
> '
>
> +test_expect_success '%(color:#aa22ac) must success' '
> + cat >expect <<-\EOF &&
> + refs/heads/main
> + refs/heads/side
> + refs/odd/spot
> + refs/tags/annotated-tag
> + refs/tags/doubly-annotated-tag
> + refs/tags/doubly-signed-tag
> + refs/tags/four
> + refs/tags/one
> + refs/tags/signed-tag
> + refs/tags/three
> + refs/tags/two
> + EOF
> + git for-each-ref --format="%(color:#aa22ac)%(refname)" >actual &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'left alignment is default' '
> cat >expect <<-\EOF &&
> refname is refs/heads/main |refs/heads/main
>
> base-commit: 311531c9de557d25ac087c1637818bd2aad6eb3a
next prev parent reply other threads:[~2021-05-11 2:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 15:31 [PATCH] [GSOC] ref-filter: solve bugs caused by enumeration ZheNing Hu via GitGitGadget
2021-05-06 1:53 ` Junio C Hamano
2021-05-06 5:02 ` ZheNing Hu
2021-05-06 5:35 ` Junio C Hamano
2021-05-06 10:39 ` ZheNing Hu
2021-05-06 11:20 ` Junio C Hamano
2021-05-06 11:52 ` ZheNing Hu
2021-05-06 21:20 ` Junio C Hamano
2021-05-07 4:32 ` ZheNing Hu
2021-05-07 4:49 ` Junio C Hamano
2021-05-07 5:09 ` ZheNing Hu
2021-05-06 16:31 ` [PATCH v2] [GSOC] ref-filter: fix read invalid union member bug ZheNing Hu via GitGitGadget
2021-05-08 15:26 ` [PATCH v3] " ZheNing Hu via GitGitGadget
2021-05-10 7:21 ` Junio C Hamano
2021-05-10 12:35 ` ZheNing Hu
2021-05-10 7:27 ` Junio C Hamano
2021-05-10 12:51 ` ZheNing Hu
2021-05-10 15:01 ` [PATCH v4] " ZheNing Hu via GitGitGadget
2021-05-11 2:29 ` Junio C Hamano [this message]
2021-05-11 6:28 ` ZheNing Hu
2021-05-11 9:30 ` Junio C Hamano
2021-05-11 11:47 ` ZheNing Hu
2021-05-11 13:12 ` Junio C Hamano
2021-05-11 13:31 ` ZheNing Hu
2021-05-11 15:35 ` [PATCH v5] " ZheNing Hu via GitGitGadget
2021-05-12 1:36 ` Junio C Hamano
2021-05-12 10:37 ` ZheNing Hu
2021-05-12 12:12 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2021-05-12 23:24 ` Junio C Hamano
2021-05-13 9:29 ` ZheNing Hu
2021-05-13 15:13 ` [PATCH v7] " ZheNing Hu 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=xmqqcztyovf7.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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).