diff options
Diffstat (limited to 'notes-utils.h')
| -rw-r--r-- | notes-utils.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/notes-utils.h b/notes-utils.h index 1190578398..d9b3c09eaf 100644 --- a/notes-utils.h +++ b/notes-utils.h @@ -3,6 +3,10 @@ #include "notes.h" +struct commit_list; +struct object_id; +struct repository; + /* * Create new notes commit from the given notes tree * @@ -14,10 +18,13 @@ * * The resulting commit SHA1 is stored in result_sha1. */ -void create_notes_commit(struct notes_tree *t, struct commit_list *parents, - const char *msg, size_t msg_len, unsigned char *result_sha1); +void create_notes_commit(struct repository *r, + struct notes_tree *t, + struct commit_list *parents, + const char *msg, size_t msg_len, + struct object_id *result_oid); -void commit_notes(struct notes_tree *t, const char *msg); +void commit_notes(struct repository *r, struct notes_tree *t, const char *msg); enum notes_merge_strategy { NOTES_MERGE_RESOLVE_MANUAL = 0, @@ -41,6 +48,8 @@ int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s); struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd); int copy_note_for_rewrite(struct notes_rewrite_cfg *c, const struct object_id *from_obj, const struct object_id *to_obj); -void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg); +void finish_copy_notes_for_rewrite(struct repository *r, + struct notes_rewrite_cfg *c, + const char *msg); #endif |