From: Markus Trippelsdorf <markus@trippelsdorf.de>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Jim Garrison <jim.garrison@nwea.org>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Globbing for ignored branches?
Date: Sat, 25 Jan 2014 15:15:42 +0100 [thread overview]
Message-ID: <20140125141542.GA402@x4> (raw)
In-Reply-To: <20140125013433.GA22336@sigill.intra.peff.net>
On 2014.01.24 at 20:34 -0500, Jeff King wrote:
> On Fri, Jan 24, 2014 at 01:08:42PM -0800, Junio C Hamano wrote:
>
> > Not really. You do not have to view it as "'not refs/heads/foo' is
> > affecting the previous '+refs/heads/*:refs/remotes/origin/*'".
> >
> > You can think of two refspecs "refs/heads/foo refs/heads/bar" are
> > both affecting the "end result"; so far we only had a single way for
> > multiple refspecs to affect the end result and that was a "union".
> > Introducing "subtract" as another mode of combining is not too bad,
> > I would think, at the conceptual level.
>
> > I tend to agree that "refs/heads/foo:" is being too cute and may be
> > confusing, at least if it will be the only way to express this in
> > the end-user-facing UI. Even some people were confused enough on a
> > very sensible "push nothing to ref means deletion" to make us add
> > another explicit way, "push --delete", to ask for the same thing.
>
> Agreed. I went with "^refs/heads/master" in the patch below, but I am
> open to other suggestions.
Many thanks for the patch. It seems to work as advertised, but only if
the negative refspec appears on a separate line. For example:
[remote "origin"]
url = git://gcc.gnu.org/git/gcc.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = ^refs/remotes/hjl
works fine, but:
[remote "origin"]
url = git://gcc.gnu.org/git/gcc.git
fetch = +refs/heads/*:refs/remotes/origin/* ^refs/remotes/hjl
doesn't. (I think this happens because bad_ref_char in refs.c checks for '^'.)
--
Markus
next prev parent reply other threads:[~2014-01-25 14:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-24 9:01 Globbing for ignored branches? Markus Trippelsdorf
2014-01-24 16:37 ` Jim Garrison
2014-01-24 17:07 ` Markus Trippelsdorf
2014-01-24 17:09 ` Markus Trippelsdorf
2014-01-24 18:23 ` Jeff King
2014-01-24 18:32 ` Markus Trippelsdorf
2014-01-24 18:55 ` Jeff King
2014-01-24 20:00 ` Junio C Hamano
2014-01-24 20:33 ` Markus Trippelsdorf
2014-01-24 20:44 ` Junio C Hamano
2014-01-24 20:52 ` Markus Trippelsdorf
2014-01-24 20:48 ` Jeff King
2014-01-24 21:08 ` Junio C Hamano
2014-01-25 1:34 ` Jeff King
2014-01-25 14:15 ` Markus Trippelsdorf [this message]
2014-01-25 17:15 ` Markus Trippelsdorf
2014-01-25 20:02 ` Jeff King
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=20140125141542.GA402@x4 \
--to=markus@trippelsdorf.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jim.garrison@nwea.org \
--cc=peff@peff.net \
/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).