From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v3 1/1] refspec: add support for negative refspecs
Date: Wed, 30 Sep 2020 14:36:00 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2009301428580.50@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200925210740.1939450-2-jacob.e.keller@intel.com>
Hi Jake,
On Fri, 25 Sep 2020, Jacob Keller wrote:
> diff --git a/remote.c b/remote.c
> index eafc14cbe759..26a127142344 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -682,6 +682,91 @@ static int match_name_with_pattern(const char *key, const char *name,
> return ret;
> }
>
> +static int refspec_match(const struct refspec_item *refspec,
> + const char *name)
> +{
> + if (refspec->pattern)
> + return match_name_with_pattern(refspec->src, name, NULL, NULL);
> +
> + return !strcmp(refspec->src, name);
> +}
> +
> +static int omit_name_by_refspec(const char *name, struct refspec *rs)
> +{
> + int i;
> +
> + for (i = 0; i < rs->nr; i++) {
> + if (rs->items[i].negative && refspec_match(&rs->items[i], name))
> + return 1;
> + }
> + return 0;
> +}
> +
> +struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
> +{
> + struct ref **tail;
> +
> + for (tail = &ref_map; *tail; ) {
> + struct ref *ref = *tail;
> +
> + if (omit_name_by_refspec(ref->name, rs)) {
> + *tail = ref->next;
> + free(ref->peer_ref);
> + free(ref);
> + } else
> + tail = &ref->next;
> + }
> +
> + return ref_map;
> +}
> +
> +static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query)
> +{
> + int i, matched_negative = 0;
> + int find_src = !query->src;
> + struct string_list reversed = STRING_LIST_INIT_NODUP;
> + const char *needle = find_src ? query->dst : query->src;
> +
> + /*
> + * Check whether the queried ref matches any negative refpsec. If so,
> + * then we should ultimately treat this as not matching the query at
> + * all.
> + *
> + * Note that negative refspecs always match the source, but the query
> + * item uses the destination. To handle this, we apply pattern
> + * refspecs in reverse to figure out if the query source matches any
> + * of the negative refspecs.
> + */
> + for (i = 0; i < rs->nr; i++) {
> + struct refspec_item *refspec = &rs->items[i];
> + char *expn_name;
> +
> + if (refspec->negative)
> + continue;
> +
> + /* Note the reversal of src and dst */
> + if (refspec->pattern) {
> + const char *key = refspec->dst ?: refspec->src;
Would you mind fixing this? This keeps getting reverted...
-- snipsnap --
From 4aea2a58a9f6bb1cbbc7a03db63a1465f9a801da Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 23 Aug 2020 22:27:17 +0200
Subject: [PATCH] fixup??? refspec: add support for negative refspecs
The `?:` operator is not supported e.g. by Visual C. Let's not use it.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
remote.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/remote.c b/remote.c
index f7d20c059b3e..1659535c1a8d 100644
--- a/remote.c
+++ b/remote.c
@@ -724,7 +724,7 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
/* Note the reversal of src and dst */
if (refspec->pattern) {
- const char *key = refspec->dst ?: refspec->src;
+ const char *key = refspec->dst ? refspec->dst : refspec->src;
const char *value = refspec->src;
if (match_name_with_pattern(key, needle, value, &expn_name))
--
2.28.0.windows.1.52.gbcabfe850c5e
next prev parent reply other threads:[~2020-09-30 12:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 21:07 [PATCH v3 0/1] implement negative refspecs Jacob Keller
2020-09-25 21:07 ` [PATCH v3 1/1] refspec: add support for " Jacob Keller
2020-09-29 21:21 ` Junio C Hamano
2020-09-30 12:36 ` Johannes Schindelin [this message]
2020-09-30 20:49 ` Jacob Keller
2020-09-30 21:05 ` Junio C Hamano
2020-09-30 21:06 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2009301428580.50@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@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.
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).