diff options
| author | Patrick Steinhardt <ps@pks.im> | 2020-01-17 08:38:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 08:38:00 +0100 |
| commit | a76348ee88c2ab4f079491f0a3810a12592b95cb (patch) | |
| tree | cf7b0d6da261e9d0721ba4acf241d1755f158100 | |
| parent | 1908884d46fbad2be8962ffbb57840a61f468a3a (diff) | |
| parent | 1bddbd02a6200d76d50a880412e407409f7b1be3 (diff) | |
| download | libgit2-a76348ee88c2ab4f079491f0a3810a12592b95cb.tar.gz | |
Merge pull request #5358 from lrm29/git_merge_driver_source_repo_non_const
merge: Return non-const git_repository from accessor method
| -rw-r--r-- | include/git2/sys/merge.h | 2 | ||||
| -rw-r--r-- | src/merge_driver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/sys/merge.h b/include/git2/sys/merge.h index bd0a8a4b7..ef4bc5aca 100644 --- a/include/git2/sys/merge.h +++ b/include/git2/sys/merge.h @@ -41,7 +41,7 @@ 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(const git_repository *) git_merge_driver_source_repo( +GIT_EXTERN(git_repository *) git_merge_driver_source_repo( const git_merge_driver_source *src); /** Gets the ancestor of the file to merge. */ diff --git a/src/merge_driver.c b/src/merge_driver.c index a529aefda..666349b15 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -32,7 +32,7 @@ static struct merge_driver_registry merge_driver_registry; static void git_merge_driver_global_shutdown(void); -const git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src) +git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src) { assert(src); return src->repo; |