Skip to content

G
git2
Commit 21d847d3 by Vicent Martí
Options

Merge pull request #920 from scunz/mergebase_const 

git_mergebase: Constness-Fix for consistency
parents 412293dc 857323d4
Showing with 2 additions and 2 deletions
include/git2/merge.h
...@@ -28,7 +28,7 @@ GIT_BEGIN_DECL ...@@ -28,7 +28,7 @@ GIT_BEGIN_DECL
* @param one one of the commits * @param one one of the commits
* @param two the other commit * @param two the other commit
*/ */
GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two); GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two);
/** /**
* Find a merge base given a list of commits * Find a merge base given a list of commits
......
src/revwalk.c
...@@ -419,7 +419,7 @@ cleanup: ...@@ -419,7 +419,7 @@ cleanup:
return error; return error;
} }
int git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two) int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two)
{ {
git_revwalk *walk; git_revwalk *walk;
git_vector list; git_vector list;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment