summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-11-09 22:49:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:21:30 -0800
commit56881843d4d916a166ac4c6ba1803e5ceba9c44d (patch)
treee0f9edaaaf032fb9998953dcc9ada0eb6bc738ec /builtin.h
parentgit notes merge: Initial implementation handling trivial merges only (diff)
downloadtgif-56881843d4d916a166ac4c6ba1803e5ceba9c44d.tar.xz
builtin/notes.c: Refactor creation of notes commits.
Create new function create_notes_commit() which is slightly more general than commit_notes() (accepts multiple commit parents and does not auto-update the notes ref). This function will be used by the notes-merge functionality in future patches. Also rewrite builtin/notes.c:commit_notes() to reuse this new function. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index ed6ee26933..908d85064d 100644
--- a/builtin.h
+++ b/builtin.h
@@ -17,7 +17,7 @@ extern void prune_packed_objects(int);
extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
struct strbuf *out);
extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
-extern int commit_notes(struct notes_tree *t, const char *msg);
+extern void commit_notes(struct notes_tree *t, const char *msg);
struct notes_rewrite_cfg {
struct notes_tree **trees;