From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: git@vger.kernel.org, Jacob Keller <jacob.e.keller@intel.com>,
Pavel Rappo <pavel.rappo@gmail.com>
Subject: Re: [PATCH] remote: handle negative refspecs in git remote show
Date: Wed, 15 Jun 2022 14:44:59 -0700 [thread overview]
Message-ID: <xmqqzgidy52c.fsf@gitster.g> (raw)
In-Reply-To: <20220614003251.16765-1-jacob.e.keller@intel.com> (Jacob Keller's message of "Mon, 13 Jun 2022 17:32:51 -0700")
Jacob Keller <jacob.keller@gmail.com> writes:
> Fix this by checking negative refspecs inside of get_ref_states. For
> each ref which matches a negative refspec, copy it into a "skipped" list
> and remove it from the fetch map. This allows us to show the following
> output instead:
>
> * remote jdk19
> Fetch URL: git@github.com:openjdk/jdk19.git
> Push URL: git@github.com:openjdk/jdk19.git
> HEAD branch: master
> Remote branches:
> master tracked
> pr/1 skipped
> pr/2 skipped
> pr/3 skipped
> Local ref configured for 'git push':
> master pushes to master (fast-forwardable)
>
> By showing the refs as skipped, it helps clarify that these references
> won't actually be fetched. Alternatively, we could simply remove them
> entirely.
Very sensible.
> @@ -367,6 +368,24 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
> die(_("Could not get fetch map for refspec %s"),
> states->remote->fetch.raw[i]);
>
> + /* handle negative refspecs first */
> + for (tail = &fetch_map; *tail; ) {
> + ref = *tail;
> +
> + if (omit_name_by_refspec(ref->name, &states->remote->fetch)) {
> + string_list_append(&states->skipped, abbrev_branch(ref->name));
> +
> + /* Matched a negative refspec, so remove this ref from
> + * consideration for being a new or tracked ref.
> + */
> + *tail = ref->next;
> + free(ref->peer_ref);
> + free(ref);
> + } else {
> + tail = &ref->next;
> + }
> + }
This is somewhat curious. Do we really need to destroy the
fetch_map like the above? I know by removing skipped items from the
list, the existing loop (below) can stop having to worry about them,
but the caller of get_ref_states() may later want to iterate over
the full fetch_map for other reasons (even if the current one does
not, a future version of the caller may have a reason to do so that
we do not know right now yet).
> +
> for (ref = fetch_map; ref; ref = ref->next) {
> if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
> string_list_append(&states->new_refs, abbrev_branch(ref->name));
IOW, is adding a new condition to this existing loop insufficient?
for (ref = fetch_map; ref; ref = ref->next) {
- if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
+ if (omit_name_by_refspec(ref->name, &states->remote->fetch))
+ string_list_append(&states->skipped, abbrev_branch(ref->name));
+ else if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
string_list_append(&states->new_refs, abbrev_branch(ref->name));
else
string_list_append(&states->tracked, abbrev_branch(ref->name));
}
Thanks.
next prev parent reply other threads:[~2022-06-15 21:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 0:32 [PATCH] remote: handle negative refspecs in git remote show Jacob Keller
2022-06-14 1:03 ` Taylor Blau
2022-06-14 1:56 ` Jacob Keller
2022-06-14 2:26 ` Taylor Blau
2022-06-16 20:48 ` Jacob Keller
2022-06-14 6:09 ` Jacob Keller
2022-06-15 21:44 ` Junio C Hamano [this message]
2022-06-16 20:41 ` Jacob Keller
2022-06-16 21:52 ` Junio C Hamano
2022-06-16 22:09 ` Jacob Keller
2022-06-16 22:33 ` Jacob Keller
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=xmqqzgidy52c.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=pavel.rappo@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).