summaryrefslogtreecommitdiff
path: root/src/merge_driver.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2017-03-15 11:46:15 +0100
committerPatrick Steinhardt <ps@pks.im>2017-03-15 11:46:15 +0100
commitbb342159d83a697461c23b0abfe9bc8e563d7346 (patch)
tree2ee6facf8722f5fee0acb80bdc92c0a1a1e634cc /src/merge_driver.c
parent8051b47f5bb25a2a80e19ff711cb67dd5421d6c9 (diff)
downloadlibgit2-bb342159d83a697461c23b0abfe9bc8e563d7346.tar.gz
merge_driver: fix const-correctness for source getters
Diffstat (limited to 'src/merge_driver.c')
-rw-r--r--src/merge_driver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c
index 5ee0b38b5..0f35d23c2 100644
--- a/src/merge_driver.c
+++ b/src/merge_driver.c
@@ -32,31 +32,31 @@ static struct merge_driver_registry merge_driver_registry;
static void git_merge_driver_global_shutdown(void);
-git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
+const git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
{
assert(src);
return src->repo;
}
-git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
+const git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
{
assert(src);
return src->ancestor;
}
-git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
+const git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
{
assert(src);
return src->ours;
}
-git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
+const git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
{
assert(src);
return src->theirs;
}
-git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
+const git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
{
assert(src);
return src->file_opts;