diff options
| author | Johan Herland <johan@herland.net> | 2013-06-12 02:13:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-12 10:38:13 -0700 |
| commit | bf9a05ba46a9d464424d22482aaa54abdd28b77d (patch) | |
| tree | 59c7c71f81859fc4d11176f02f810f80b22f55d7 /notes-merge.h | |
| parent | 49c2470400bbb695b953abeb4e6737be747317af (diff) | |
| download | git-bf9a05ba46a9d464424d22482aaa54abdd28b77d.tar.gz | |
Move create_notes_commit() from notes-merge.c into notes-utils.c
create_notes_commit() is needed by both the notes-merge code, and by
commit_notes() in notes-utils. Since it is generally useful, and not
bound to the notes-merge machinery, we move it from (the more specific)
notes-merge to (the more general) notes-utils.
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, 0 insertions, 14 deletions
diff --git a/notes-merge.h b/notes-merge.h index 0c11b173a1..1d01f6aacf 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -26,20 +26,6 @@ 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 struct strbuf *msg, unsigned char *result_sha1); - -/* * Merge notes from o->remote_ref into o->local_ref * * The given notes_tree 'local_tree' must be the notes_tree referenced by the |