From: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
ZheNing Hu <adlternative@gmail.com>,
ZheNing Hu <adlternative@gmail.com>
Subject: [PATCH] [GSOC] ref-filter: solve bugs caused by enumeration
Date: Wed, 05 May 2021 15:31:04 +0000 [thread overview]
Message-ID: <pull.949.git.1620228664666.gitgitgadget@gmail.com> (raw)
From: ZheNing Hu <adlternative@gmail.com>
Johannes Schindelin seems to have introduced a bug in
cc72385f(for-each-ref: let upstream/push optionally
report the remote name), it use `atom->u.remote_ref.option`
which is a member of enumeration in the judgment statement.
When we use other members in the enumeration `used_atom.u`,
and it happened to fill in `remote_ref.push`, this judgment
may still be established and produces errors. So replace the
judgment statement with `starts_with(name, "push")` to fix
the error.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
---
[GSOC] ref-filter: solve bugs caused by enumeration
This is the problem I found in the implementation of git for-each-ref
--format="%(notes)".
I added a new option to the enum used_atom.u , but the program seems to
output the value of "%(push)".
After research, it should be the problem of incorrect use of enumeration
values here.
Thanks, may the force be with you!
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-949%2Fadlternative%2Fref-filter-enum-bug-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-949/adlternative/ref-filter-enum-bug-fix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/949
ref-filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ref-filter.c b/ref-filter.c
index a0adb4551d87..f467f2fbbb73 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 (starts_with(name, "push")) {
const char *branch_name;
v->s = xstrdup("");
if (!skip_prefix(ref->refname, "refs/heads/",
base-commit: 311531c9de557d25ac087c1637818bd2aad6eb3a
--
gitgitgadget
next reply other threads:[~2021-05-05 15:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 15:31 ZheNing Hu via GitGitGadget [this message]
2021-05-06 1:53 ` [PATCH] [GSOC] ref-filter: solve bugs caused by enumeration 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
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=pull.949.git.1620228664666.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).