Merge branch 'jk/add-i-fixes'

[thirdparty/git.git] / commit.h

diff --git a/commit.h b/commit.h
index 1b2dea5d85ebe52c8e5f32f1e5e26ff33e0c566c..bd73b8447203cb668742f5f809b57842d319a6aa 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -36,8 +36,6 @@ struct commit {
         * or get_commit_tree_oid().
         */
        struct tree *maybe_tree;
-       uint32_t graph_pos;
-       uint32_t generation;
        unsigned int index;
 };
 
@@ -272,10 +270,9 @@ int commit_tree(const char *msg, size_t msg_len,
 
 int commit_tree_extended(const char *msg, size_t msg_len,
                         const struct object_id *tree,
-                        struct commit_list *parents,
-                        struct object_id *ret, const char *author,
-                        const char *sign_commit,
-                        struct commit_extra_header *);
+                        struct commit_list *parents, struct object_id *ret,
+                        const char *author, const char *committer,
+                        const char *sign_commit, struct commit_extra_header *);
 
 struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);