From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Stephen Kelly <steveire@gmail.com>,
KDE PIM <kde-pim@kde.org>
Subject: Re: Creating remote branch called HEAD corrupts remote clones
Date: Thu, 20 Jan 2011 16:54:57 -0500 [thread overview]
Message-ID: <20110120215456.GB11468@sigill.intra.peff.net> (raw)
In-Reply-To: <7vbp3bqmiy.fsf@alter.siamese.dyndns.org>
On Thu, Jan 20, 2011 at 01:43:17PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > Hmm. It seems like the symbolic ref is the culprit, not just HEAD. The
> > HEAD thing is the most likely, of course, but I could do something like:
> >
> > git symbolic-ref refs/remotes/origin/convenient-alias \
> > refs/remotes/origin/some-name-you-dont-like
>
> Isn't it already wrong to do the above locally, in the sense that it is
> equally wrong to do this?
Probably. My argument in favor would be "that is what we are doing with
remotes/*/HEAD", but I think the logic is somewhat circular there.
Thinking on it more, yeah, if you want "convenient-alias", you are
probably better off to do:
git symbolic-ref refs/convenient-alias refs/remotes/origin/whatever
> git update-ref refs/remotes/origin/no-such-thing-exists-over-there
> refs/heads/master
Actually, don't we end up with that in the case of upstream deleting a
ref? Which isn't to say it isn't a stupid thing to do, but that we can
and do get into that state.
Thinking on it even more, I don't think we can cover all of the weird
"you have a ref named $foo and they suddenly created a ref named $foo"
push corner cases. There is no substitution for actual communication and
organization of ref names if you are going to be pushing along with
other people into a central repo. Because fundamentally the ref name is
the unique identifier, and matching refs during push tries to reconcile
matches based on those identifiers.
> I personally like this line of thought, especially as a thought experiment
> to see what corner cases we could find, but I doubt I will be able to say
> we covered all the corner cases with confidence without thinking long and
> very hard. For now, I do not find this issue worth spending that kind of
> deep thinking, especially when a lot simpler and easier to explain
> workaround is available, but others may disagree and perfect your idea.
Yeah, after reading your response and considering a bit, I think the
simple "don't make HEAD" thing (or at least "don't pull or push HEAD")
is a sane workaround.
-Peff
next prev parent reply other threads:[~2011-01-20 21:55 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-17 10:02 Creating remote branch called HEAD corrupts remote clones Stephen Kelly
2011-01-20 11:14 ` Stephen Kelly
2011-01-20 13:03 ` Thomas Rast
2011-01-20 15:05 ` Stephen Kelly
2011-01-20 15:41 ` Erik Faye-Lund
2011-01-20 16:00 ` Stephen Kelly
2011-01-20 17:32 ` Felipe Contreras
2011-01-20 19:21 ` Wesley J. Landaker
2011-01-20 19:53 ` Junio C Hamano
2011-01-20 20:38 ` Jeff King
2011-01-20 21:43 ` Junio C Hamano
2011-01-20 21:54 ` Jeff King [this message]
2011-01-20 23:52 ` Felipe Contreras
2011-01-21 17:37 ` Junio C Hamano
2011-01-22 12:46 ` Felipe Contreras
2011-02-20 13:17 ` Stephen Kelly
2011-04-26 12:09 ` Stephen Kelly
2011-04-26 18:18 ` Felipe Contreras
2011-04-27 9:18 ` Stephen Kelly
2011-04-27 9:48 ` Felipe Contreras
2011-04-27 11:29 ` Stephen Kelly
2011-04-27 11:32 ` Felipe Contreras
2011-04-27 11:37 ` Stephen Kelly
2011-04-27 12:26 ` Felipe Contreras
2011-04-27 12:21 ` Erik Faye-Lund
2011-04-27 12:49 ` Erik Faye-Lund
2011-05-02 19:26 ` Stephen Kelly
2011-05-02 19:43 ` Erik Faye-Lund
2011-05-03 17:54 ` Felipe Contreras
2011-05-03 18:08 ` Stephen Kelly
2011-05-03 19:20 ` Felipe Contreras
2011-05-04 12:35 ` Erik Faye-Lund
2011-05-09 7:51 ` [PATCH] only warn about ambiguous refs if stderr is a tty Erik Faye-Lund
2011-05-09 8:03 ` Jeff King
2011-05-09 8:41 ` Erik Faye-Lund
2011-05-09 10:32 ` Jeff King
2011-05-09 12:37 ` Erik Faye-Lund
2011-05-09 12:49 ` Jeff King
2011-05-09 16:33 ` Junio C Hamano
2011-05-09 22:09 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110120215456.GB11468@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kde-pim@kde.org \
--cc=steveire@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).