diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/git-access.c | 4 | ||||
| -rw-r--r-- | core/save-git.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/core/git-access.c b/core/git-access.c index 3688cb90c..982a51cfd 100644 --- a/core/git-access.c +++ b/core/git-access.c @@ -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); -#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; -#endif merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; merge_options.rename_threshold = 100; if (git_commit_lookup(&local_commit, repo, local_id)) { diff --git a/core/save-git.c b/core/save-git.c index a304e0d94..7bf7b2e1d 100644 --- a/core/save-git.c +++ b/core/save-git.c @@ -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) { -#if LIBGIT2_VER_MAJOR || LIBGIT2_VER_MINOR >= 20 if (git_signature_default(authorp, repo) == 0) return 0; -#endif /* try to fetch the user info from the OS, otherwise use default values. */ struct user_info user = { .name = NULL, .email = NULL }; subsurface_user_info(&user); |