From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Jeff King <peff@peff.net>, Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git branch --edit-description a custom file
Date: Thu, 31 Oct 2019 12:30:52 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1910311229150.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <8b9021fa-f60c-a2e0-1174-a2fc1f11c476@gmail.com>
Hi Phillip,
On Thu, 31 Oct 2019, Phillip Wood wrote:
> On 31/10/2019 10:22, Johannes Schindelin wrote:
> >
> > On Thu, 31 Oct 2019, Jeff King wrote:
> >
> > > On Wed, Oct 30, 2019 at 03:43:28PM -0700, Denton Liu wrote:
> > >
> > > > On Wed, Oct 30, 2019 at 04:28:35PM -0400, Jeff King wrote:
> > > > Dscho brought up in the GGG thread[1] that perhaps we want to treat
> > > > branch descriptions like notes and have them all under something like
> > > > `refs/notes/branches`. This would certainly solve my problem of
> > > > having versioned descriptions and it would probably do it in a much more
> > > > general way than having a versioned included config.
> > > >
> > > > Anyone see any potential problems with this approach?
> > >
> > > I don't think it would be `refs/notes/`, as that is assumed to contain
> > > mappings of object ids (and if I understand correctly, this would be a
> > > mapping of branch names to data.
> > >
> > > You could just have "refs/meta/descriptions/foo" pointing to a blob
> > > which contains the description of "refs/heads/foo". That makes it easy
> > > to edit descriptions, even if you don't like using "git branch
> > > --edit-description".
> >
> > The only problem with this is that it's not really versioned, as it
> > would be hard to go back to previous versions and/or share the history
> > via pushing to a remote repository.
> >
> > But I guess that a very simple pseudo branch would do it, where
> > `refs/meta/<branch-name>` would point to a commit that has a tree
> > with a single file in it: `description.txt`.
>
> Having some way to share branch metadata would be nice. I like the idea of
> using commits so we can merge changes and revert to a previous version. There
> is some previous discussion here [1]. I'd really like to be able to share the
> upstream for a branch between two computers as well. I also use a commit
> containing a tree with a single file stored at refs/todo/<branch> (and fetched
> to refs/remote/<remote>/todo/<branch>) to share todo lists with notes and
> ideas for future commits on branches that I'm working on on more than one
> machine. Having them version controlled so they can be merged has been useful.
And while we're dreaming: it would be nice to discern between "push
upstreams" and "base upstreams". Example: when I work on the
`fix-t5516-flakiness` branch, I target `upstream/master`, but I push to
`dscho`, i.e. my "push upstream" is `dscho/fix-t5516-flakiness`.
Ciao,
Dscho
> Best Wishes
>
> Phillip
>
> [1] https://public-inbox.org/git/1519324188.6391.156.camel@mad-scientist.net/
>
>
> > I now like that idea a lot better than my original notes idea.
> >
> > Ciao,
> > Dscho
> >
> > >
> > > You could also have "refs/meta/descriptions" to point to a _single_ blob
> > > with all of the descriptions. It could even be in the existing config
> > > format. And then you could include it with "[include] blob = ...". That
> > > doesn't exist yet, but it would be easy to add (it was something I had
> > > always considered when writing the config-include code, but there was
> > > never really a good use; and you do have to be careful about pointing to
> > > untrusted blobs). That's a convoluted way to get where you want, but I
> > > wonder if integrating to the existing config system would have any
> > > benefits. I haven't really thought it through.
> > >
> > > (Of course that's also only one step away from having a versioned config
> > > file in your .git directory, but it might possibly be a bit easier to
> > > manage, since it would always be committed).
> > >
> > > That's mostly off-the-top-of-my-head rambling, so please disregard
> > > anything that seems totally off-base. :)
> > >
> > > -Peff
> > >
>
>
next prev parent reply other threads:[~2019-10-31 11:31 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 [this message]
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
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=nycvar.QRO.7.76.6.1910311229150.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--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).