summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-11-09 22:49:39 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-10 10:25:52 -0800
commit4a9cf1cefc0fd05e0eb46f862e398f1e4ac1c9a7 (patch)
tree40ed5e736dc62146c12984ebbda982e2e257f11c
parent55d060771a15f4ce75e71b966d8117d8a32cc47b (diff)
downloadgit-4a9cf1cefc0fd05e0eb46f862e398f1e4ac1c9a7.tar.gz
notes.h: Make default_notes_ref() available in notes API
Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--notes.c2
-rw-r--r--notes.h14
2 files changed, 15 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index bb03eb0364..d71c0a30bf 100644
--- a/notes.c
+++ b/notes.c
@@ -898,7 +898,7 @@ static int notes_display_config(const char *k, const char *v, void *cb)
return 0;
}
-static const char *default_notes_ref(void)
+const char *default_notes_ref(void)
{
const char *notes_ref = NULL;
if (!notes_ref)
diff --git a/notes.h b/notes.h
index c0288b0d32..20db42fe95 100644
--- a/notes.h
+++ b/notes.h
@@ -44,6 +44,20 @@ extern struct notes_tree {
} default_notes_tree;
/*
+ * Return the default notes ref.
+ *
+ * The default notes ref is the notes ref that is used when notes_ref == NULL
+ * is passed to init_notes().
+ *
+ * This the first of the following to be defined:
+ * 1. The '--ref' option to 'git notes', if given
+ * 2. The $GIT_NOTES_REF environment variable, if set
+ * 3. The value of the core.notesRef config variable, if set
+ * 4. GIT_NOTES_DEFAULT_REF (i.e. "refs/notes/commits")
+ */
+const char *default_notes_ref(void);
+
+/*
* Flags controlling behaviour of notes tree initialization
*
* Default behaviour is to initialize the notes tree from the tree object