From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Dennis Kaarsemaker <dennis@kaarsemaker.net>, git@vger.kernel.org
Subject: Re: [PATCH] remote: make prune work for mixed mirror/non-mirror repos
Date: Thu, 20 Jun 2013 19:08:44 -0400 [thread overview]
Message-ID: <20130620230843.GA5780@sigill.intra.peff.net> (raw)
In-Reply-To: <7vppvgpfib.fsf@alter.siamese.dyndns.org>
On Thu, Jun 20, 2013 at 03:46:20PM -0700, Junio C Hamano wrote:
> Dennis Kaarsemaker <dennis@kaarsemaker.net> writes:
>
> > When cloning a repo with --mirror, and adding more remotes later,
> > get_stale_heads for origin would mark all refs from other repos as stale. In
> > this situation, with refs-src and refs->dst both equal to refs/*, we should
> > ignore refs/remotes/* when looking for stale refs to prevent this from
> > happening.
>
> I do not think it is a right solution to single out refs/remotes/*.
Yeah, I agree.
> Going back to your original example:
>
> [remote "origin"]
> url = git://github.com/git/git.git
> fetch = +refs/*:refs/*
> mirror = true
> [remote "peff"]
> url = git://github.com/peff/git.git
> fetch = +refs/heads/*:refs/remotes/peff/*
There is a fundamental namespace conflict here: one remote is claiming
the whole refs/* namespace, and another remote is claiming some subset.
"fetch --prune" is only one type of problem you can have; you might also
overwrite stuff from the "peff" remote with stuff from the "origin"
remote (if it happens to have "refs/remotes/peff/foo" itself).
> I think this is an unsolvable problem, and I _think_ the root cause
> of the issue is the configuration above that allows the RHS of
> different fetch refspecs to overlap. refs/* is more generic and
> covers refs/remotes/peff/* and refs/remotes/github/*. You cannot
> even know, just by looking at "origin" and your local repository,
> if refs/remotes/github/html you have should go away or it might have
> come from somewhere else.
Exactly.
> The best we _could_ do, without contacting all the defined remotes,
> is probably to check each ref that we did not see from "origin" (for
> example, you find "refs/remotes/peff/frotz" that your origin does
> not have) and see if it could match RHS of fetch refspec of somebody
> else (e.g. RHS of "refs/heads/*:refs/remotes/peff/*" matches that
> ref). Then we can conclude that refs/remotes/peff/frotz _might_
> have come from Peff's repository and not from "origin", and then we
> can optionally issue a warning and refrain from removing it.
I think this is just papering over the problem in one instance. What
happens when you _do_ have overlapping refs in the "origin" remote, and
you have a true conflict.
I wonder why Dennis wants to "refs/*:refs/*" in the first place. It
is not usually a useful thing to have in a non-bare repository, because
fetches will overwrite local work on branches. If he just wanted the
automatic "git push --mirror" setting, that does not depend on the fetch
refspec.
We made this distinction in "git remote --mirror={fetch,remote}", but I
don't think "git clone --mirror" ever learned about it.
-Peff
next prev parent reply other threads:[~2013-06-20 23:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 21:23 [BUG?] remote prune origin interacts badly with clone --mirror and multiple remotes Dennis Kaarsemaker
2013-06-20 22:11 ` [PATCH] remote: make prune work for mixed mirror/non-mirror repos Dennis Kaarsemaker
2013-06-20 22:46 ` Junio C Hamano
2013-06-20 23:07 ` Dennis Kaarsemaker
2013-06-20 23:30 ` Junio C Hamano
2013-06-20 23:38 ` Dennis Kaarsemaker
2013-06-20 23:44 ` Junio C Hamano
2013-06-20 23:08 ` Jeff King [this message]
2013-06-20 23:29 ` Dennis Kaarsemaker
2013-06-20 23:36 ` Junio C Hamano
2013-06-20 22:53 ` [PATCH v2] " Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 0/3] Handling overlapping refspecs slightly smarter Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes Dennis Kaarsemaker
2013-06-21 18:42 ` Junio C Hamano
2013-06-23 13:35 ` Dennis Kaarsemaker
2013-06-23 21:22 ` Junio C Hamano
2013-06-23 21:43 ` Dennis Kaarsemaker
2013-06-23 22:33 ` Junio C Hamano
2013-06-26 21:10 ` Dennis Kaarsemaker
2013-06-26 23:42 ` Junio C Hamano
2013-06-21 10:04 ` [PATCH 2/3] remote: Add test for prune and mixed --mirror and normal remotes Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 3/3] remote: don't prune when detecting overlapping refspecs Dennis Kaarsemaker
2013-06-21 18:53 ` 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=20130620230843.GA5780@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).