mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support libgit2 api 0.24

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2016-06-23 22:56:35 +02:00 • committed by Dirk Hohndel
parent b2b29c00ec
commit 7c7588a986
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/git-access.c
View file

@ -308,7 +308,11 @@ static int try_to_git_merge(git_repository *repo, git_reference **local_p, git_r
} }
git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION); git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR > 23
merge_options.flags = GIT_MERGE_FIND_RENAMES;
#else
merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES; merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES;
#endif
merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION;
merge_options.rename_threshold = 100; merge_options.rename_threshold = 100;
if (git_commit_lookup(&local_commit, repo, local_id)) { if (git_commit_lookup(&local_commit, repo, local_id)) {