commit: copy merged signed tags to headers of merge commit

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index 5b57eab578ee4fd10efedecfca59f2992e686a3c..c1a723ecdb877bbbb75fe9fcaf98cef7b7edb59b 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -181,9 +181,26 @@ static inline int single_parent(struct commit *commit)
 
 struct commit_list *reduce_heads(struct commit_list *heads);
 
+struct commit_extra_header {
+       struct commit_extra_header *next;
+       char *key;
+       char *value;
+       size_t len;
+};
+
+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,
-               struct commit_list *parents, unsigned char *ret,
-               const char *author);
+                      struct commit_list *parents, unsigned char *ret,
+                      const char *author);
+
+extern int commit_tree_extended(const char *msg, unsigned char *tree,
+                               struct commit_list *parents, unsigned char *ret,
+                               const char *author,
+                               struct commit_extra_header *);
+
+extern void free_commit_extra_headers(struct commit_extra_header *extra);
 
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */