Commit 1bddbd02 by Laurence McGlashan

merge: Return non-const git_repository from git_merge_driver_source_repo accessor.

parent cc4f4cbe
...@@ -41,7 +41,7 @@ GIT_EXTERN(git_merge_driver *) git_merge_driver_lookup(const char *name); ...@@ -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; typedef struct git_merge_driver_source git_merge_driver_source;
/** Get the repository that the source data is coming from. */ /** 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); const git_merge_driver_source *src);
/** Gets the ancestor of the file to merge. */ /** Gets the ancestor of the file to merge. */
......
...@@ -32,7 +32,7 @@ static struct merge_driver_registry merge_driver_registry; ...@@ -32,7 +32,7 @@ static struct merge_driver_registry merge_driver_registry;
static void git_merge_driver_global_shutdown(void); 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); assert(src);
return src->repo; 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