Skip to content

Commit bb34215

Browse files
committed
merge_driver: fix const-correctness for source getters
1 parent 8051b47 commit bb34215

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

include/git2/sys/merge.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ GIT_EXTERN(git_merge_driver *) git_merge_driver_lookup(const char *name);
3636
typedef struct git_merge_driver_source git_merge_driver_source;
3737

3838
/** Get the repository that the source data is coming from. */
39-
GIT_EXTERN(git_repository *) git_merge_driver_source_repo(
39+
GIT_EXTERN(const git_repository *) git_merge_driver_source_repo(
4040
const git_merge_driver_source *src);
4141

4242
/** Gets the ancestor of the file to merge. */
43-
GIT_EXTERN(git_index_entry *) git_merge_driver_source_ancestor(
43+
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ancestor(
4444
const git_merge_driver_source *src);
4545

4646
/** Gets the ours side of the file to merge. */
47-
GIT_EXTERN(git_index_entry *) git_merge_driver_source_ours(
47+
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ours(
4848
const git_merge_driver_source *src);
4949

5050
/** Gets the theirs side of the file to merge. */
51-
GIT_EXTERN(git_index_entry *) git_merge_driver_source_theirs(
51+
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_theirs(
5252
const git_merge_driver_source *src);
5353

5454
/** Gets the merge file options that the merge was invoked with */
55-
GIT_EXTERN(git_merge_file_options *) git_merge_driver_source_file_options(
55+
GIT_EXTERN(const git_merge_file_options *) git_merge_driver_source_file_options(
5656
const git_merge_driver_source *src);
5757

5858

src/merge_driver.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@ static struct merge_driver_registry merge_driver_registry;
3232

3333
static void git_merge_driver_global_shutdown(void);
3434

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

41-
git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
41+
const git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
4242
{
4343
assert(src);
4444
return src->ancestor;
4545
}
4646

47-
git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
47+
const git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
4848
{
4949
assert(src);
5050
return src->ours;
5151
}
5252

53-
git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
53+
const git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
5454
{
5555
assert(src);
5656
return src->theirs;
5757
}
5858

59-
git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
59+
const git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
6060
{
6161
assert(src);
6262
return src->file_opts;

0 commit comments

Comments
 (0)