diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-03-15 11:46:15 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-03-15 11:46:15 +0100 |
| commit | bb342159d83a697461c23b0abfe9bc8e563d7346 (patch) | |
| tree | 2ee6facf8722f5fee0acb80bdc92c0a1a1e634cc /include/git2/sys | |
| parent | 8051b47f5bb25a2a80e19ff711cb67dd5421d6c9 (diff) | |
| download | libgit2-bb342159d83a697461c23b0abfe9bc8e563d7346.tar.gz | |
merge_driver: fix const-correctness for source getters
Diffstat (limited to 'include/git2/sys')
| -rw-r--r-- | include/git2/sys/merge.h | 10 |
1 files changed, 5 insertions, 5 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); |