diff options
| author | Laurence McGlashan <Laurence.McGlashan@mathworks.co.uk> | 2020-01-15 10:30:00 +0000 |
|---|---|---|
| committer | Laurence McGlashan <Laurence.McGlashan@mathworks.co.uk> | 2020-01-15 10:30:00 +0000 |
| commit | 1bddbd02a6200d76d50a880412e407409f7b1be3 (patch) | |
| tree | 897a9864c3c5b13df7b5a8ac89a4f91ed71a3208 | |
| parent | cc4f4cbea48ac00a5edec1b3570ac3d2ef10fe77 (diff) | |
| download | libgit2-1bddbd02a6200d76d50a880412e407409f7b1be3.tar.gz | |
merge: Return non-const git_repository from git_merge_driver_source_repo accessor.
| -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; |