Skip to content

Commit 0608d5d

Browse files
Gumenik Alexandrpks-t
authored andcommitted
merge_driver: add unresolved getters for git_merge_driver_source
1 parent 467185f commit 0608d5d

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

src/merge_driver.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,35 @@ 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)
36+
{
37+
assert(src);
38+
return src->repo;
39+
}
40+
41+
git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
42+
{
43+
assert(src);
44+
return src->ancestor;
45+
}
46+
47+
git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
48+
{
49+
assert(src);
50+
return src->ours;
51+
}
52+
53+
git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
54+
{
55+
assert(src);
56+
return src->theirs;
57+
}
58+
59+
git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
60+
{
61+
assert(src);
62+
return src->file_opts;
63+
}
3564

3665
int git_merge_driver__builtin_apply(
3766
git_merge_driver *self,

0 commit comments

Comments
 (0)