summaryrefslogtreecommitdiff
path: root/include/git2/revwalk.h
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlos@cmartin.tk>2012-03-03 03:31:51 +0100
committerCarlos Martín Nieto <carlos@cmartin.tk>2012-04-12 20:25:24 +0200
commitde7ab85dc614ba702a89f3f0c761c68ee1e00fda (patch)
tree4b38067acaf4e7dd35ec00c6c10852786bf85af7 /include/git2/revwalk.h
parent06b9d915901b3dd9dc85016bb000e631eb1da1d7 (diff)
downloadlibgit2-de7ab85dc614ba702a89f3f0c761c68ee1e00fda.tar.gz
Implement git_merge_base()
It's implemented in revwalk.c so it has access to the revision walker's commit cache and related functions. The algorithm is the one used by git, modified so it fits better with the library's functions.
Diffstat (limited to 'include/git2/revwalk.h')
-rw-r--r--include/git2/revwalk.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/git2/revwalk.h b/include/git2/revwalk.h
index 632c67588..db27c62b1 100644
--- a/include/git2/revwalk.h
+++ b/include/git2/revwalk.h
@@ -232,6 +232,9 @@ GIT_EXTERN(void) git_revwalk_free(git_revwalk *walk);
*/
GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk);
+GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two);
+
+
/** @} */
GIT_END_DECL
#endif