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

builtin/notes.c: Refactor creation of notes commits.

Browse Source 
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>
This commit is contained in:
Johan Herland
2010-11-09 22:49:47 +01:00
committed by Junio C Hamano
parent 75ef3f4a5c
commit 56881843d4
4 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
notes-merge.h
View File

@ -14,6 +14,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
*