diff options
author | Patrick Steinhardt <ps@pks.im> | 2017-03-20 11:05:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-20 11:05:03 +0100 |
commit | 44b3b9feca37be4837096853ceaf1f5545c532d5 (patch) | |
tree | e6b8f9e9ef2f1323e2b643964b7d284956bb229b | |
parent | 6dfb983cfc8992fc21690ced6203894f57a19686 (diff) | |
parent | bb342159d83a697461c23b0abfe9bc8e563d7346 (diff) | |
download | libgit2-44b3b9feca37be4837096853ceaf1f5545c532d5.tar.gz |
Merge pull request #4162 from pks-t/pks/merge-source-fixes
merge_driver: fix const-correctness for source getters
-rw-r--r-- | include/git2/sys/merge.h | 10 | ||||
-rw-r--r-- | src/merge_driver.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/git2/sys/merge.h b/include/git2/sys/merge.h index 031941042..eed106c07 100644 --- a/include/git2/sys/merge.h +++ b/include/git2/sys/merge.h @@ -36,23 +36,23 @@ GIT_EXTERN(git_merge_driver *) git_merge_driver_lookup(const char *name); typedef struct git_merge_driver_source git_merge_driver_source; /** Get the repository that the source data is coming from. */ -GIT_EXTERN(git_repository *) git_merge_driver_source_repo( +GIT_EXTERN(const git_repository *) git_merge_driver_source_repo( const git_merge_driver_source *src); /** Gets the ancestor of the file to merge. */ -GIT_EXTERN(git_index_entry *) git_merge_driver_source_ancestor( +GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ancestor( const git_merge_driver_source *src); /** Gets the ours side of the file to merge. */ -GIT_EXTERN(git_index_entry *) git_merge_driver_source_ours( +GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ours( const git_merge_driver_source *src); /** Gets the theirs side of the file to merge. */ -GIT_EXTERN(git_index_entry *) git_merge_driver_source_theirs( +GIT_EXTERN(const git_index_entry *) git_merge_driver_source_theirs( const git_merge_driver_source *src); /** Gets the merge file options that the merge was invoked with */ -GIT_EXTERN(git_merge_file_options *) git_merge_driver_source_file_options( +GIT_EXTERN(const git_merge_file_options *) git_merge_driver_source_file_options( const git_merge_driver_source *src); 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; |