Unverified Commit a76348ee by Patrick Steinhardt Committed by GitHub

Merge pull request #5358 from lrm29/git_merge_driver_source_repo_non_const

merge: Return non-const git_repository from accessor method
parents 1908884d 1bddbd02
......@@ -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. */
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment