From: Taylor Blau <me@ttaylorr.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: Mon, 13 Jun 2022 21:03:47 -0400 [thread overview]
Message-ID: <Yqfec9yvT3LKomNK@nand.local> (raw)
In-Reply-To: <20220614003251.16765-1-jacob.e.keller@intel.com>
On Mon, Jun 13, 2022 at 05:32:51PM -0700, Jacob Keller wrote:
> 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:
Seems sensible.
> + /* 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;
> + }
> + }
> +
Not being overly familiar with the "git remote show" code, this
implementation looks very reasonable to me. If we see a negative
refspec, we remove it from the fetch_map list and append it to the
skipped list. Otherwise, we increment our pointer, and continue along
until we reach the end of the list.
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index fff14e13ed43..e19b8d666c73 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -302,6 +302,33 @@ test_expect_success 'show' '
> )
> '
>
> +cat >test/expect <<EOF
> +* remote origin
> + Fetch URL: $(pwd)/one
> + Push URL: $(pwd)/one
> + HEAD branch: main
> + Remote branches:
> + main skipped
> + side tracked
> + upstream stale (use 'git remote prune' to remove)
> + Local branches configured for 'git pull':
> + ahead merges with remote main
> + main merges with remote main
> + Local refs configured for 'git push':
> + main pushes to main (local out of date)
> + main pushes to upstream (create)
> +EOF
> +
> +test_expect_success 'show with negative refspecs' '
> + test_when_finished "git -C test config --fixed-value --unset remote.origin.fetch ^refs/heads/main" &&
> + (
> + cd test &&
> + git config --add remote.origin.fetch ^refs/heads/main &&
Doing "git config --unset" outside of the subshell could be avoided by
ditching the subshell altogether, perhaps with something like:
test_config -C test remote.origin.fetch ^refs/heads/main &&
git -C test remote show origin >actual &&
test_cmp test/expect actual
Thanks,
Taylor
next prev parent reply other threads:[~2022-06-14 1:03 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 [this message]
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
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=Yqfec9yvT3LKomNK@nand.local \
--to=me@ttaylorr.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).