X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=154c0e34ff7d2dbaddcfb66b74d26697ffba6381;hb=b51ffa80f6e65fde91a667c4825eeeb4deb997f6;hp=3745f120994cb6876e1ccc1bfc5e07c6cc3fc5c9;hpb=b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5;p=git.git diff --git a/commit.h b/commit.h index 3745f1209..154c0e34f 100644 --- a/commit.h +++ b/commit.h @@ -191,17 +191,17 @@ struct commit_extra_header { extern void append_merge_tag_headers(struct commit_list *parents, struct commit_extra_header ***tail); -extern int commit_tree(const char *msg, unsigned char *tree, +extern int commit_tree(const struct strbuf *msg, unsigned char *tree, struct commit_list *parents, unsigned char *ret, - const char *author); + const char *author, const char *sign_commit); -extern int commit_tree_extended(const char *msg, unsigned char *tree, +extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree, struct commit_list *parents, unsigned char *ret, - const char *author, + const char *author, const char *sign_commit, struct commit_extra_header *); -extern struct commit_extra_header *read_commit_extra_headers(struct commit *); -extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len); +extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); +extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); extern void free_commit_extra_headers(struct commit_extra_header *extra); @@ -218,4 +218,6 @@ struct merge_remote_desc { */ struct commit *get_merge_parent(const char *name); +extern int parse_signed_commit(const unsigned char *sha1, + struct strbuf *message, struct strbuf *signature); #endif /* COMMIT_H */