summaryrefslogtreecommitdiff
path: root/src/commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/commit.c')
-rw-r--r--src/commit.c50
1 files changed, 40 insertions, 10 deletions
diff --git a/src/commit.c b/src/commit.c
index c7b83ed43..e6bfd95ce 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -76,7 +76,7 @@ int git_commit_create_v(
return res;
}
-int git_commit_create(
+int git_commit_create_oid(
git_oid *oid,
git_repository *repo,
const char *update_ref,
@@ -84,22 +84,18 @@ int git_commit_create(
const git_signature *committer,
const char *message_encoding,
const char *message,
- const git_tree *tree,
+ const git_oid *tree,
int parent_count,
- const git_commit *parents[])
+ const git_oid *parents[])
{
git_buf commit = GIT_BUF_INIT;
int i;
git_odb *odb;
- assert(git_object_owner((const git_object *)tree) == repo);
-
- git_oid__writebuf(&commit, "tree ", git_object_id((const git_object *)tree));
+ git_oid__writebuf(&commit, "tree ", tree);
- for (i = 0; i < parent_count; ++i) {
- assert(git_object_owner((const git_object *)parents[i]) == repo);
- git_oid__writebuf(&commit, "parent ", git_object_id((const git_object *)parents[i]));
- }
+ for (i = 0; i < parent_count; ++i)
+ git_oid__writebuf(&commit, "parent ", parents[i]);
git_signature__writebuf(&commit, "author ", author);
git_signature__writebuf(&commit, "committer ", committer);
@@ -131,6 +127,40 @@ on_error:
return -1;
}
+int git_commit_create(
+ git_oid *oid,
+ git_repository *repo,
+ const char *update_ref,
+ const git_signature *author,
+ const git_signature *committer,
+ const char *message_encoding,
+ const char *message,
+ const git_tree *tree,
+ int parent_count,
+ const git_commit *parents[])
+{
+ int retval, i;
+ const git_oid **parent_oids;
+
+ assert(git_object_owner((const git_object *)tree) == repo);
+
+ parent_oids = git__malloc(parent_count * sizeof(git_oid *));
+ GITERR_CHECK_ALLOC(parent_oids);
+
+ for (i = 0; i < parent_count; ++i) {
+ assert(git_object_owner((const git_object *)parents[i]) == repo);
+ parent_oids[i] = git_object_id((const git_object *)parents[i]);
+ }
+
+ retval = git_commit_create_oid(oid, repo, update_ref, author, committer,
+ message_encoding, message,
+ git_object_id((const git_object *)tree),
+ parent_count, parent_oids);
+
+ git__free((void *)parent_oids);
+ return retval;
+}
+
int git_commit__parse_buffer(git_commit *commit, const void *data, size_t len)
{
const char *buffer = data;