From: Jeff King <peff@peff.net>
To: phillip.wood@dunelm.org.uk
Cc: Denton Liu <liu.denton@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git branch --edit-description a custom file
Date: Fri, 1 Nov 2019 12:49:55 -0400 [thread overview]
Message-ID: <20191101164955.GA26219@sigill.intra.peff.net> (raw)
In-Reply-To: <822d51af-d522-bf2c-72de-f54a4ccb3b38@gmail.com>
On Fri, Nov 01, 2019 at 12:29:43PM +0000, Phillip Wood wrote:
> > > I'd love to see a consensus around putting remote versions of refs/foo under
> > > refs/remote/<remote-name>/foo. To share notes I add a refspec that fetches
> > > to refs/remote/<remote-name>/notes. It is a pain that 'git pull' wont merge
> > > them for me though.
> >
> > The trouble with that sort of scheme is that it conflicts with the
> > current namespace scheme, which puts the remote "notes" branch in
> > "refs/remotes/<remote-name>/notes". And it's not just a problem if you
> > want to have a branch called "notes". Think about what "git fetch
> > --prune" would do.
>
> I was suggesting a convention of using refs/remote/ not refs/remotes/ for
> tracking remote refs that are not branches to avoid that problem. It's not
> ideal to have remote branches under a different namespace to all the other
> remote refs but it does avoid breaking current setups. I haven't thought it
> through but perhaps in the long run we could migrate remote branches to
> refs/remote/<remote-name>/heads/ and treat refs/remotes/<remote-name>/ as an
> alias for refs/remote/<remote-name>/heads/. As you say below we'd need to
> think about how to use remote tags as well.
Oh indeed, I totally missed that subtlety. Sorry.
> Thanks for the links, I'll have a read through them.
Maybe I've managed to trick you into working on the greater refs/remotes
organization problem, though. ;)
-Peff
next prev parent reply other threads:[~2019-11-01 16:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 18:39 git branch --edit-description a custom file Denton Liu
2019-10-30 20:28 ` Jeff King
2019-10-30 22:43 ` Denton Liu
2019-10-31 6:18 ` Jeff King
2019-10-31 10:22 ` Johannes Schindelin
2019-10-31 11:00 ` Phillip Wood
2019-10-31 11:30 ` Johannes Schindelin
2019-10-31 13:45 ` Philip Oakley
2019-10-31 15:42 ` Jeff King
2019-11-03 17:56 ` Philip Oakley
2019-11-04 19:50 ` Jeff King
2019-11-04 3:21 ` Junio C Hamano
2019-10-31 18:19 ` Denton Liu
2019-10-31 19:53 ` Phillip Wood
2019-10-31 20:07 ` Jeff King
2019-11-01 12:29 ` Phillip Wood
2019-11-01 16:49 ` Jeff King [this message]
2019-11-01 20:35 ` Phillip Wood
2019-11-02 4:53 ` Junio C Hamano
2019-10-31 17:35 ` Denton Liu
2019-10-31 18:06 ` 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=20191101164955.GA26219@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).