proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-10 13:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'commitparents' of https://github.com/JustinLove/libgit2 into JustinLove-commitparents

Browse Source
This commit is contained in:
Vicent Marti 2010-12-02 04:42:33 +02:00
commit 41109a7e7e
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/commit.c
View File

@ -257,6 +257,35 @@ time_t git_commit_time(git_commit *commit)
return commit->commit_time;
}
unsigned int git_commit_parentcount(git_commit *commit)
{
git_commit_parents *parent;
unsigned int count = 0;
assert(commit);
CHECK_FULL_PARSE();
for (parent = commit->parents; parent != NULL; parent = parent->next) {
count++;
}
return count;
}
git_commit * git_commit_parent(git_commit *commit, unsigned int n)
{
git_commit_parents *parent;
assert(commit);
CHECK_FULL_PARSE();
for (parent = commit->parents; parent != NULL && n > 0; parent = parent->next) {
n--;
}
return parent ? parent->commit : NULL;
}
void git_commit_set_tree(git_commit *commit, git_tree *tree)
{
assert(commit && tree);

16
src/git/commit.h
View File

@ -93,6 +93,22 @@ GIT_EXTERN(const git_person *) git_commit_author(git_commit *commit);
*/
GIT_EXTERN(const git_tree *) git_commit_tree(git_commit *commit);
/**
* Get the number of parents of this commit
*
* @param commit a previously loaded commit.
* @return integer of count of parents
*/
GIT_EXTERN(unsigned int) git_commit_parentcount(git_commit *commit);
/**
* Get the specified parent of the commit.
* @param commit a previously loaded commit.
* @param n the position of the entry
* @return a pointer to the commit; NULL if out of bounds
*/
GIT_EXTERN(git_commit *) git_commit_parent(git_commit *commit, unsigned int n);
/**
* Add a new parent commit to an existing commit
* @param commit the commit object

10
tests/t0402-details.c
View File

@ -31,6 +31,8 @@ BEGIN_TEST(query_details_test)
const git_person *author, *committer;
const char *message, *message_short;
time_t commit_time;
unsigned int parents, p;
git_commit *parent;
git_oid_mkstr(&id, commit_ids[i]);
@ -41,6 +43,7 @@ BEGIN_TEST(query_details_test)
author = git_commit_author(commit);
committer = git_commit_committer(commit);
commit_time = git_commit_time(commit);
parents = git_commit_parentcount(commit);
must_be_true(strcmp(author->name, "Scott Chacon") == 0);
must_be_true(strcmp(author->email, "schacon@gmail.com") == 0);
@ -49,6 +52,13 @@ BEGIN_TEST(query_details_test)
must_be_true(strchr(message, '\n') != NULL);
must_be_true(strchr(message_short, '\n') == NULL);
must_be_true(commit_time > 0);
must_be_true(0 <= parents && parents <= 2);
for (p = 0;p < parents;p++) {
parent = git_commit_parent(commit, p);
must_be_true(parent != NULL);
must_be_true(git_commit_author(parent) != NULL); // is it really a commit?
}
must_be_true(git_commit_parent(commit, parents) == NULL);
}
git_repository_free(repo);