diff options
| author | Vicent Martà <vicent@github.com> | 2012-09-11 14:56:13 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-09-11 14:56:13 -0700 |
| commit | 21d847d38ffd5055ffbcaabebf115edbee8e8b94 (patch) | |
| tree | 745bca71a4a96eb57b4aaae3e77bd4b87da50b43 | |
| parent | 412293dcc95369f0a42ae9a94f30fe7328a5491c (diff) | |
| parent | 857323d4db63751517bdb2e63336aae4e82bb78a (diff) | |
| download | libgit2-21d847d38ffd5055ffbcaabebf115edbee8e8b94.tar.gz | |
Merge pull request #920 from scunz/mergebase_const
git_mergebase: Constness-Fix for consistency
| -rw-r--r-- | include/git2/merge.h | 2 | ||||
| -rw-r--r-- | src/revwalk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index c80803d36..37b1c787d 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -28,7 +28,7 @@ GIT_BEGIN_DECL * @param one one of the commits * @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 diff --git a/src/revwalk.c b/src/revwalk.c index 1a0927719..8141d177b 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -419,7 +419,7 @@ cleanup: 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_vector list; |