From: Jonathan Nieder <jrnieder@gmail.com>
To: Kenny Root <kroot@google.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
Thomas Rast <trast@student.ethz.ch>
Subject: Re: [PATCH] Remove restriction on notes ref base
Date: Tue, 2 Nov 2010 01:52:08 -0500 [thread overview]
Message-ID: <20101102065208.GA4280@burratino> (raw)
In-Reply-To: <1288657003-17802-1-git-send-email-kroot@google.com>
(+cc: Johan, Thomas)
Kenny Root wrote:
> Git notes were restricted to refs/notes/* in the command line utilities,
> but setting things like GIT_NOTES_REF to something outside of that
> structure would work.
>
> This removes the restrictions on the git notes command line interface.
Could you explain what those restrictions are (perhaps through an
example in the form of a patch to the t/ subdirectory)?
Cc-ing some people more knowledgeable about notes than I am; maybe
they can give more information about what this notes.rewriteref
protection and other check are about.
Jonathan
[patch follows for their convenience.]
> Signed-off-by: Kenny Root <kroot@google.com>
> ---
> builtin/notes.c | 11 ++---------
> 1 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/notes.c b/builtin/notes.c
> index 6d07aac..9acce7b 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -343,11 +343,7 @@ static int notes_rewrite_config(const char *k, const char *v, void *cb)
> } else if (!c->refs_from_env && !strcmp(k, "notes.rewriteref")) {
> /* note that a refs/ prefix is implied in the
> * underlying for_each_glob_ref */
> - if (!prefixcmp(v, "refs/notes/"))
> - string_list_add_refs_by_glob(c->refs, v);
> - else
> - warning("Refusing to rewrite notes in %s"
> - " (outside of refs/notes/)", v);
> + string_list_add_refs_by_glob(c->refs, v);
> return 0;
> }
>
> @@ -473,9 +469,6 @@ static struct notes_tree *init_notes_check(const char *subcommand)
> init_notes(NULL, NULL, NULL, 0);
> t = &default_notes_tree;
>
> - if (prefixcmp(t->ref, "refs/notes/"))
> - die("Refusing to %s notes in %s (outside of refs/notes/)",
> - subcommand, t->ref);
> return t;
> }
>
> @@ -844,7 +837,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix)
>
> if (override_notes_ref) {
> struct strbuf sb = STRBUF_INIT;
> - if (!prefixcmp(override_notes_ref, "refs/notes/"))
> + if (!prefixcmp(override_notes_ref, "refs/"))
> /* we're happy */;
> else if (!prefixcmp(override_notes_ref, "notes/"))
> strbuf_addstr(&sb, "refs/");
> --
next prev parent reply other threads:[~2010-11-02 6:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-02 0:16 [PATCH] Remove restriction on notes ref base Kenny Root
2010-11-02 6:52 ` Jonathan Nieder [this message]
2010-11-02 8:48 ` Johan Herland
2010-11-02 14:11 ` Shawn Pearce
2010-11-02 14:29 ` Jeff King
2010-11-02 15:24 ` Johan Herland
2010-11-02 17:41 ` Junio C Hamano
2010-11-02 22:58 ` Johan Herland
2010-11-02 23:28 ` Chris Forbes
2010-11-03 6:41 ` Jonathan Nieder
2010-11-03 16:17 ` Junio C Hamano
2010-11-03 16:30 ` Sverre Rabbelier
2010-11-04 0:49 ` Johan Herland
2010-11-04 1:00 ` Sverre Rabbelier
2010-11-04 14:35 ` Tag refspecs (was Re: [PATCH] Remove restriction on notes ref base) Marc Branchaud
2010-11-05 1:02 ` Johan Herland
2010-11-05 15:11 ` Marc Branchaud
2010-11-04 14:58 ` [PATCH] Remove restriction on notes ref base Jeff King
2010-11-05 1:29 ` Johan Herland
2010-11-05 14:55 ` Jeff King
2010-11-03 16:35 ` Jonathan Nieder
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=20101102065208.GA4280@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=kroot@google.com \
--cc=trast@student.ethz.ch \
/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).