From: Jeff King <peff@peff.net>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Git mailing list <git@vger.kernel.org>
Subject: Re: [RFC 3/3] refspec: add support for negative refspecs
Date: Thu, 20 Aug 2020 22:33:35 -0400 [thread overview]
Message-ID: <20200821023335.GA3124022@coredump.intra.peff.net> (raw)
In-Reply-To: <CA+P7+xqfAqnoKBeOiO6f7tdyi_7M=wKpmnFoWBt6UHbOqbYCzQ@mail.gmail.com>
On Thu, Aug 20, 2020 at 04:59:53PM -0700, Jacob Keller wrote:
> > The relevant commit is 2467a4fa03 (Remove duplicate ref matches in
> > fetch, 2007-10-08), I think. We may end up with multiple refspecs
> > requesting a particular ref. E.g.:
> >
> > git fetch origin refs/heads/master refs/heads/*
> >
> > I don't think the order should matter. If we apply negative refspecs
> > first, then we'd either remove both copies or leave both untouched (and
> > if the latter, then de-dup to a single). If we apply negative refspecs
> > after de-duping, then we'd either remove the single or leave it in
> > place. But the result is the same either way.
>
> I'm not sure this is quite true in the case where destinations are
> supplied. Suppose this case:
Oh, you're right. I was too focused on the de-duping of identical refs,
but this is also handling colliding destinations.
> git fetch refs/heads/*:refs/remotes/origin/*
> refs/other/mybranch:refs/remotes/origin/mybranch
>
> This would ofcourse error out due to de-duping where we determine that
> both would fetch to the same place.. however if you also added a
> negative refspec:
>
> git fetch refs/heads/*:refs/remotes/origin/*
> refs/other/mybranch:refs/remotes/origin/mybranch ^refs/heads/mybranch
>
> then shouldn't this work? meaning we should de-dupe only after we
> apply negative refspecs in this case?
Yes, I'd agree we should be applying the negative refspecs first, and
then de-duping / looking for collisions. Which I think is what the patch
is doing currently.
-Peff
next prev parent reply other threads:[~2020-08-21 2:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 0:25 [RFC 1/3] refspec: fix documentation referring to refspec_item Jacob Keller
2020-08-15 0:25 ` [RFC 2/3] refspec: make sure stack refspec_item variables are zeroed Jacob Keller
2020-08-17 16:33 ` Junio C Hamano
2020-08-17 16:49 ` Jacob Keller
2020-08-15 0:25 ` [RFC 3/3] refspec: add support for negative refspecs Jacob Keller
2020-08-17 18:02 ` Jacob Keller
2020-08-17 23:43 ` Junio C Hamano
2020-08-18 0:04 ` Jacob Keller
2020-08-18 17:41 ` Jeff King
2020-08-20 23:59 ` Jacob Keller
2020-08-21 2:33 ` Jeff King [this message]
2020-08-21 16:19 ` Junio C Hamano
2020-08-21 16:28 ` Jacob Keller
2020-08-21 17:16 ` Jacob Keller
2020-08-21 17:26 ` Jacob Keller
2020-08-21 18:21 ` Jacob Keller
2020-08-21 18:59 ` Jeff King
2020-08-17 16:18 ` [RFC 1/3] refspec: fix documentation referring to refspec_item Junio C Hamano
2020-08-21 21:17 ` Jacob Keller
2020-08-21 21:41 ` Junio C Hamano
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=20200821023335.GA3124022@coredump.intra.peff.net \
--to=peff@peff.net \
--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.
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).