From: Johan Herland <johan@herland.net>
To: Yann Dirson <dirson@bertin.fr>
Cc: git@vger.kernel.org
Subject: Re: Commit notes workflow
Date: Tue, 14 Jun 2011 12:15:50 +0200 [thread overview]
Message-ID: <201106141215.50689.johan@herland.net> (raw)
In-Reply-To: <20110613090940.664b1b97@chalon.bertin.fr>
On Monday 13 June 2011, Yann Dirson wrote:
> We have notes merge support since a couple of releases now, but no real
> example in the docs of how best to use that. That is, no suggested
> mapping of remote notes, let alone automatic setup of refspecs at clone
> time.
True. I think this has been held up, partly because I (or anyone else)
haven't found the time to work on this, and partly because we want to add
some kind of default refspec to easily share notes between repos; the latter
has been caught up in the discussion you refer to in [1].
> Trying to setup such refspecs, I find myself puzzled:
>
> * if I store remote notes under refs/notes (eg.
> refs/notes/*:refs/notes/origin/* as fetch refspec), then a
> refs/notes/*:refs/notes/origin/* push refspec will include
> refs/notes/origin/*, which we obviously don't want
>
> * if I store them outside of refs/notes (eg.
> refs/notes/*:refs/remote-notes/origin/* ), then "git notes" silently
> ignores them: no output nor any error message from "notes list" or
> "notes merge".
>
> Do we really want to "git notes" to ignore everything not in refs/notes/
> ? I can think of 2 possibilities out of this situation:
>
> * remove that limitation
> * decide on a naming convention for remote notes, and teach "git notes"
> not to ignore it
The naming convention I have proposed (in the discussion for [1]) is
refs/notes/*:refs/remotes/$remote/notes/*
(but it obviously depends on reorganizing the entire remote refs hierarchy)
> A (minor) problem with the second possibility is that this naming
> convention could evolve, eg. if we end up with something like was
> proposed in [1] for 1.8.0. Is there any real drawback with the first
> suggestion ?
>
> [1] http://marc.info/?l=git&m=129661334011986&w=4
My gut feeling is to keep some sort of limit notes refs, and if/when we get
around to implementing my proposal in [1] (or some variation thereof), we
will of course extend the limit to put "refs/remotes/$remote/notes/*" (or
whatever is decided) in the same category as "refs/notes/*".
In the meantime, I'm unsure if it's a good idea to remove the limitation
altogether (allowing notes refs everywhere), since re-introducing a limit at
a later point will then be MUCH harder...
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2011-06-14 10:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 7:09 Commit notes workflow Yann Dirson
2011-06-14 10:15 ` Johan Herland [this message]
[not found] ` <f81891b81d39.4df76a5c@bertin.fr>
2011-06-14 14:41 ` Johan Herland
2011-06-15 9:20 ` ydirson
2011-06-15 9:37 ` Johan Herland
2011-06-15 9:57 ` ydirson
2011-06-15 10:53 ` Johan Herland
2011-06-18 21:06 ` [PATCH 0/6] Small notes usability improvements Yann Dirson
2011-06-18 21:06 ` [PATCH 1/6] Bring notes.c template handling in line with commit.c Yann Dirson
2011-06-19 21:23 ` Johan Herland
2011-06-19 22:50 ` Junio C Hamano
2011-06-20 7:41 ` Johan Herland
2011-06-20 18:48 ` Yann Dirson
2011-06-21 19:39 ` Yann Dirson
2011-06-18 21:06 ` [PATCH 2/6] Factorize shortening of notes refname for display Yann Dirson
2011-06-19 21:25 ` Johan Herland
2011-06-19 22:51 ` Junio C Hamano
2011-06-20 18:49 ` Yann Dirson
2011-06-18 21:06 ` [PATCH 3/6] Include name of notes ref in template when creating/editing notes Yann Dirson
2011-06-18 21:06 ` [PATCH 4/6] Allow "git notes merge" to use refs/remote-notes/ as a source Yann Dirson
2011-06-19 21:45 ` Johan Herland
2011-06-18 21:06 ` [PATCH 5/6] Assume a note ref starting with refs must not be prepended refs/notes/ Yann Dirson
2011-06-18 21:06 ` [PATCH 6/6] RFC - Notes merge: die when asked to merge a non-existent ref Yann Dirson
2011-06-19 22:03 ` Johan Herland
2011-06-20 7:16 ` Jeff King
2011-06-20 7:29 ` Johan Herland
2011-06-19 22:06 ` [PATCH 0/6] Small notes usability improvements Johan Herland
-- strict thread matches above, loose matches on Subject: below --
2011-06-14 14:21 Commit notes workflow ydirson
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=201106141215.50689.johan@herland.net \
--to=johan@herland.net \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
/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).