From 70c38de3a1880b5920fd799b0059518a79ca2acd Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 23 Aug 2015 18:15:33 -0700 Subject: Cloud storage: be very strict about renames Because of the structure of some of our files git too easily assumed that they were renames and that confused the merge algorithm. Signed-off-by: Dirk Hohndel --- git-access.c | 1 + 1 file changed, 1 insertion(+) (limited to 'git-access.c') diff --git a/git-access.c b/git-access.c index b98b373a1..47973d577 100644 --- a/git-access.c +++ b/git-access.c @@ -187,6 +187,7 @@ static int try_to_git_merge(git_repository *repo, git_reference *local, git_refe git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION); merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES; merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; + merge_options.rename_threshold = 100; if (git_commit_lookup(&local_commit, repo, local_id)) return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: can't get commit (%s)"), giterr_last()->message); if (git_commit_tree(&local_tree, local_commit)) -- cgit v1.2.3-70-g09d2