From: Johannes Sixt <j.sixt@viscovery.net>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Dropping '+' from fetch = +refs/heads/*:refs/remotes/origin/*?
Date: Fri, 02 Sep 2011 09:00:55 +0200 [thread overview]
Message-ID: <4E607F27.2000405@viscovery.net> (raw)
In-Reply-To: <20110902000039.GB9339@sigill.intra.peff.net>
Am 9/2/2011 2:00, schrieb Jeff King:
> Right now, I think of it as a local cache for whatever the remote side
> has. In other words, a way of separating the network-fetching parts of
> the workflow from the local parts.
This is also my interpretation. For this reason, I don't think a change is
necessary.
> So I consider that a downside, because it's extra work for the user[1].
> What are the upsides?
>
> Is this about preventing workflow-related mistakes where people
> accidentally merge in rebased commits, creating annoying shadow
> histories?
>
> Is it about preventing malicious rewinds from infecting downstream
> repositories?
All good questions to ask.
> [1] What I really don't like is that cloning git.git is no longer:
>
> git clone git://git.kernel.org/pub/scm/git/git.git
>
> which is a minimal as it can be, but becomes:
>
> git clone git://git.kernel.org/pub/scm/git/git.git
> cd git
> git config --add remote.origin.fetch +refs/heads/pu:refs/remotes/origin/pu
>
> It's not that my fingers are too tired to do all that typing, but
> rather that the first set of instructions is very easy to explain,
> and the second one is full of magic and head-scratching about why
> git isn't handling this magic itself.
Absolutely.
> It would be considerably nicer if the server had some way of saying
> "I expect this branch to be rewound". Which has been discussed off
> and on over the years, as I recall.
So, if such a feature were available, wouldn't it be nicer if the initial
clone set up the refspec like this:
[remote "origin"]
url = git://git.kernel.org/pub/scm/git/git.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = refs/heads/maint:refs/remotes/origin/maint
fetch = refs/heads/master:refs/remotes/origin/master
i.e., the non-wildcard refspec are about which branches are *not* expected
to be rewound rather than the other way around.
-- Hannes
next prev parent reply other threads:[~2011-09-02 7:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 18:25 Dropping '+' from fetch = +refs/heads/*:refs/remotes/origin/*? Junio C Hamano
2011-09-01 18:39 ` Junio C Hamano
2011-09-01 19:14 ` Shawn Pearce
2011-09-01 19:20 ` Michael J Gruber
2011-09-01 19:35 ` Matthieu Moy
2011-09-01 19:50 ` Shawn Pearce
2011-09-02 5:55 ` Matthieu Moy
2011-09-02 0:00 ` Jeff King
2011-09-02 7:00 ` Johannes Sixt [this message]
2011-09-02 15:26 ` Jeff King
2011-09-02 7:42 ` Michael J Gruber
2011-09-02 15:29 ` Jeff King
2011-09-02 16:14 ` Junio C Hamano
2011-09-02 16:25 ` Jeff King
2011-09-02 16:47 ` Junio C Hamano
2011-09-05 18:15 ` Shawn Pearce
2011-09-05 20:47 ` Jeff King
2011-09-05 20:53 ` Shawn Pearce
2011-09-05 20:57 ` Jeff King
2011-09-05 21:14 ` Shawn Pearce
2011-09-07 21:20 ` [RFC/PATCH] fetch: bigger forced-update warnings Jeff King
2011-09-07 21:39 ` Shawn Pearce
2011-09-07 21:53 ` Junio C Hamano
2011-09-07 21:57 ` Jeff King
2011-09-07 22:42 ` Thomas Rast
2011-09-06 7:39 ` Dropping '+' from fetch = +refs/heads/*:refs/remotes/origin/*? Matthieu Moy
2011-09-06 7:51 ` Michael J Gruber
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=4E607F27.2000405@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).