Skip to content

Commit 1bddbd0

Browse files
Laurence McGlashanLaurence McGlashan
authored andcommitted
merge: Return non-const git_repository from git_merge_driver_source_repo accessor.
1 parent cc4f4cb commit 1bddbd0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/git2/sys/merge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ GIT_EXTERN(git_merge_driver *) git_merge_driver_lookup(const char *name);
4141
typedef struct git_merge_driver_source git_merge_driver_source;
4242

4343
/** Get the repository that the source data is coming from. */
44-
GIT_EXTERN(const git_repository *) git_merge_driver_source_repo(
44+
GIT_EXTERN(git_repository *) git_merge_driver_source_repo(
4545
const git_merge_driver_source *src);
4646

4747
/** Gets the ancestor of the file to merge. */

src/merge_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static struct merge_driver_registry merge_driver_registry;
3232

3333
static void git_merge_driver_global_shutdown(void);
3434

35-
const git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
35+
git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
3636
{
3737
assert(src);
3838
return src->repo;

0 commit comments

Comments
 (0)