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

2 files changed, 45 insertions, 0 deletions

diff --git a/src/commit.c b/src/commit.c
index 6fcbfd734..8af92bff2 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -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);
diff --git a/src/git/commit.h b/src/git/commit.h
index 8cb3401b6..70b08e94f 100644
--- a/src/git/commit.h
+++ b/src/git/commit.h
@@ -94,6 +94,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
  * @param new_parent the new commit which will be a parent