mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: remove support for ancient versions of libgit2

Browse source 
We require a minimum of libgit2 0.26.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-04-09 16:59:12 -07:00
parent 3828ec6097
commit 67a717dc05
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INSTALL
View file

@ -97,7 +97,7 @@ Other third party library dependencies
-------------------------------------- --------------------------------------
In order for our cloud storage to be fully functional you need In order for our cloud storage to be fully functional you need
libgit2 0.23 or newer. libgit2 0.26 or newer.
cmake build system cmake build system

4
core/git-access.c
View file

@ -359,11 +359,7 @@ 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; merge_options.flags = GIT_MERGE_FIND_RENAMES;
#else
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)) {

2
core/save-git.c
View file

@ -1022,10 +1022,8 @@ int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree
static int get_authorship(git_repository *repo, git_signature **authorp) static int get_authorship(git_repository *repo, git_signature **authorp)
{ {
#if LIBGIT2_VER_MAJOR || LIBGIT2_VER_MINOR >= 20
if (git_signature_default(authorp, repo) == 0) if (git_signature_default(authorp, repo) == 0)
return 0; return 0;
#endif
/* try to fetch the user info from the OS, otherwise use default values. */ /* try to fetch the user info from the OS, otherwise use default values. */
struct user_info user = { .name = NULL, .email = NULL }; struct user_info user = { .name = NULL, .email = NULL };
subsurface_user_info(&user); subsurface_user_info(&user);