[PATCH v7 11/13] notes: add shorthand --ref to override GIT_NOTES_REF
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Mar 12, 2010, 17:04 UTC
- Message-ID
- <64e07051ff37ccc8528064c0dccc75eeeddf4701.1268413246.git.trast@student.ethz.ch>
- In-Reply-To
- <cover.1268413246.git.trast@student.ethz.ch>
Adds a shorthand option that overrides the GIT_NOTES_REF variable, and hence determines the notes tree that will be manipulated. It also DWIMs a refs/notes/ prefix.
Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johan Herland <johan@herland.net> ---
Documentation/git-notes.txt | 5 +++++ builtin/notes.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 77311bd..02a2baf 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -116,6 +116,11 @@ OPTIONS Like '-C', but with '-c' the editor is invoked, so that the user can further edit the note message. +--ref <ref>:: + Manipulate the notes tree in <ref>. This overrides both + GIT_NOTES_REF and the "core.notesRef" configuration. The ref + is taken to be in `refs/notes/` if it is not qualified. + Author ------ Written by Johannes Schindelin <johannes.schindelin@gmx.de> and diff --git a/builtin/notes.c b/builtin/notes.c index 6c2297a..cb30ad0 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -438,6 +438,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix) int given_object = 0, i = 1, retval = 0; struct msg_arg msg = { 0, 0, STRBUF_INIT }; const char *rewrite_cmd = NULL; + const char *override_notes_ref = NULL; struct option options[] = { OPT_GROUP("Notes contents options"), { OPTION_CALLBACK, 'm', "message", &msg, "MSG", @@ -455,6 +456,8 @@ int cmd_notes(int argc, const char **argv, const char *prefix) OPT_GROUP("Other options"), OPT_BOOLEAN('f', "force", &force, "replace existing notes"), OPT_BOOLEAN(0, "stdin", &from_stdin, "read objects from stdin"), + OPT_STRING(0, "ref", &override_notes_ref, "notes_ref", + "use notes from <notes_ref>"), OPT_STRING(0, "for-rewrite", &rewrite_cmd, "command", "load rewriting config for <command> (implies --stdin)"), OPT_END() @@ -464,6 +467,19 @@ int cmd_notes(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, git_notes_usage, 0); + if (override_notes_ref) { + struct strbuf sb = STRBUF_INIT; + if (!prefixcmp(override_notes_ref, "refs/notes/")) + /* we're happy */; + else if (!prefixcmp(override_notes_ref, "notes/")) + strbuf_addstr(&sb, "refs/"); + else + strbuf_addstr(&sb, "refs/notes/"); + strbuf_addstr(&sb, override_notes_ref); + setenv("GIT_NOTES_REF", sb.buf, 1); + strbuf_release(&sb); + } + if (argc && !strcmp(argv[0], "list")) list = 1; else if (argc && !strcmp(argv[0], "add"))
-- 1.7.0.2.417.gbc354