summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-06 12:44:07 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-06 12:44:07 -0800
commit5de89d3abfca98b0dfd0280d28576940c913d60d (patch)
treece339497e72abc84f4a1bbc9b270b07ab46dbc0c /commit.h
parent4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (diff)
parentd041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (diff)
downloadgit-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.gz
Merge branch 'jc/show-sig'
* jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/commit.h b/commit.h
index 4df397865a..154c0e34ff 100644
--- a/commit.h
+++ b/commit.h
@@ -193,15 +193,15 @@ extern void append_merge_tag_headers(struct commit_list *parents,
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 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 */