diff options
| author | Johan Herland <johan@herland.net> | 2010-11-09 21:49:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:21:30 (GMT) |
| commit | 56881843d4d916a166ac4c6ba1803e5ceba9c44d (patch) | |
| tree | e0f9edaaaf032fb9998953dcc9ada0eb6bc738ec /notes-merge.h | |
| parent | 75ef3f4a5cc69b21bc825ed0e739030d77a4f077 (diff) | |
| download | git-56881843d4d916a166ac4c6ba1803e5ceba9c44d.zip git-56881843d4d916a166ac4c6ba1803e5ceba9c44d.tar.gz git-56881843d4d916a166ac4c6ba1803e5ceba9c44d.tar.bz2 | |
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 'notes-merge.h')
| -rw-r--r-- | notes-merge.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/notes-merge.h b/notes-merge.h index fd572ac..49e1b3a 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -15,6 +15,20 @@ struct notes_merge_options { void init_notes_merge_options(struct notes_merge_options *o); /* + * Create new notes commit from the given notes tree + * + * Properties of the created commit: + * - tree: the result of converting t to a tree object with write_notes_tree(). + * - parents: the given parents OR (if NULL) the commit referenced by t->ref. + * - author/committer: the default determined by commmit_tree(). + * - commit message: msg + * + * The resulting commit SHA1 is stored in result_sha1. + */ +void create_notes_commit(struct notes_tree *t, struct commit_list *parents, + const char *msg, unsigned char *result_sha1); + +/* * Merge notes from o->remote_ref into o->local_ref * * The commits given by the two refs are merged, producing one of the following |