mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move create_notes_commit() from notes-merge.c into notes-utils.c

Browse Source 
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>
This commit is contained in:
Johan Herland
2013-06-12 02:13:01 +02:00
committed by Junio C Hamano
parent 49c2470400
commit bf9a05ba46
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
notes-merge.h
View File

@ -25,20 +25,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
*