summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Cunz <Sascha@BabbelBox.org>2012-09-09 15:53:57 +0200
committerSascha Cunz <Sascha@BabbelBox.org>2012-09-09 15:53:57 +0200
commit857323d4db63751517bdb2e63336aae4e82bb78a (patch)
treead2048c858d5c7fc926245aae46bdaf0a0740791
parent17b06f4d47bfd9fae8073c85d71751df94e50050 (diff)
downloadlibgit2-857323d4db63751517bdb2e63336aae4e82bb78a.tar.gz
git_mergebase: Constness-Fix for consistency
-rw-r--r--include/git2/merge.h2
-rw-r--r--src/revwalk.c2
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;