summaryrefslogtreecommitdiff
path: root/notes.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 14:15:59 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-03 14:15:59 -0800
commit1cb3ed308dcfaa6084b8aed075c772aeb9e57243 (patch)
tree75a9536e7071b4785887ef6c251be09df45d46d9 /notes.h
parent017565525f969c26c43443d998a1283cac843d10 (diff)
parentb3715b75226668e26f1f2abe7e2f93cdbbf6e2f5 (diff)
downloadgit-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.tar.gz
Merge branch 'jk/notes-merge-from-anywhere'
"git notes merge" used to limit the source of the merged notes tree to somewhere under refs/notes/ hierarchy, which was too limiting when inventing a workflow to exchange notes with remote repositories using remote-tracking notes trees (located in e.g. refs/remote-notes/ or somesuch). * jk/notes-merge-from-anywhere: notes: allow merging from arbitrary references
Diffstat (limited to 'notes.h')
-rw-r--r--notes.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/notes.h b/notes.h
index e5d67fd375..5345642cfd 100644
--- a/notes.h
+++ b/notes.h
@@ -302,4 +302,11 @@ void string_list_add_refs_from_colon_sep(struct string_list *list,
/* Expand inplace a note ref like "foo" or "notes/foo" into "refs/notes/foo" */
void expand_notes_ref(struct strbuf *sb);
+/*
+ * Similar to expand_notes_ref, but will check whether the ref can be located
+ * via get_sha1 first, and only falls back to expand_notes_ref in the case
+ * where get_sha1 fails.
+ */
+void expand_loose_notes_ref(struct strbuf *sb);
+
#endif