From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johan Herland <johan@herland.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org
Subject: [PATCH 1/6] notes: make expand_notes_ref globally accessible
Date: Tue, 29 Mar 2011 16:55:32 -0400 [thread overview]
Message-ID: <20110329205532.GA23466@sigill.intra.peff.net> (raw)
In-Reply-To: <20110329205307.GA30959@sigill.intra.peff.net>
This function is useful for other commands besides "git
notes" which want to let users refer to notes by their
shorthand name.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/notes.c | 10 ----------
notes.c | 10 ++++++++++
notes.h | 3 +++
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index a0f310b..6227607 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -100,16 +100,6 @@ struct msg_arg {
struct strbuf buf;
};
-static void expand_notes_ref(struct strbuf *sb)
-{
- if (!prefixcmp(sb->buf, "refs/notes/"))
- return; /* we're happy */
- else if (!prefixcmp(sb->buf, "notes/"))
- strbuf_insert(sb, 0, "refs/", 5);
- else
- strbuf_insert(sb, 0, "refs/notes/", 11);
-}
-
static int list_each_note(const unsigned char *object_sha1,
const unsigned char *note_sha1, char *note_path,
void *cb_data)
diff --git a/notes.c b/notes.c
index a013c1b..f6b9b6a 100644
--- a/notes.c
+++ b/notes.c
@@ -1285,3 +1285,13 @@ int copy_note(struct notes_tree *t,
return 0;
}
+
+void expand_notes_ref(struct strbuf *sb)
+{
+ if (!prefixcmp(sb->buf, "refs/notes/"))
+ return; /* we're happy */
+ else if (!prefixcmp(sb->buf, "notes/"))
+ strbuf_insert(sb, 0, "refs/", 5);
+ else
+ strbuf_insert(sb, 0, "refs/notes/", 11);
+}
diff --git a/notes.h b/notes.h
index 83bd6e0..60bdf28 100644
--- a/notes.h
+++ b/notes.h
@@ -307,4 +307,7 @@ void string_list_add_refs_by_glob(struct string_list *list, const char *glob);
void string_list_add_refs_from_colon_sep(struct string_list *list,
const char *globs);
+/* Expand inplace a note ref like "foo" or "notes/foo" into "refs/notes/foo" */
+void expand_notes_ref(struct strbuf *sb);
+
#endif
--
1.7.4.2.7.g9407
next prev parent reply other threads:[~2011-03-29 20:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 10:05 [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Michael J Gruber
2011-03-29 12:39 ` Johan Herland
2011-03-29 14:33 ` Jeff King
2011-03-29 15:16 ` Michael J Gruber
2011-03-29 18:32 ` Junio C Hamano
2011-03-29 20:53 ` Jeff King
2011-03-29 20:55 ` Jeff King [this message]
2011-03-29 20:56 ` [PATCH 2/6] revision.c: refactor notes ref expansion Jeff King
2011-03-29 20:56 ` [PATCH 3/6] notes: refactor display notes extra refs field Jeff King
2011-03-29 20:57 ` [PATCH 4/6] notes: refactor display notes default handling Jeff King
2011-03-29 22:02 ` Junio C Hamano
2011-03-29 20:57 ` [PATCH 5/6] revision.c: support --notes command-line option Jeff King
2011-03-29 20:59 ` [PATCH 6/6] revision.c: make --no-notes reset --notes list Jeff King
2011-03-29 22:04 ` Junio C Hamano
2011-03-29 21:44 ` [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Johan Herland
2011-03-29 22:18 ` [PATCH 7/6] log/pretty-options: Document --[no-]notes and deprecate old notes options Johan Herland
2011-03-30 0:22 ` Jeff King
2011-03-30 0:57 ` Johan Herland
2011-03-30 3:32 ` Jeff King
2011-03-29 14:35 ` [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Jeff King
2011-03-29 19:01 ` Jeff King
2011-03-29 19:48 ` Michael J Gruber
2011-03-29 20:23 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110329205532.GA23466@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
/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).