diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-23 18:15:33 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:43:27 -0700 |
| commit | 70c38de3a1880b5920fd799b0059518a79ca2acd (patch) | |
| tree | 76a054cd4dc9d0b14c85359cb8fc6d7ac34b4439 | |
| parent | a45c5f1acf728d28449f00d6ed37d9449c9e0ee1 (diff) | |
| download | subsurface-70c38de3a1880b5920fd799b0059518a79ca2acd.tar.gz | |
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 <dirk@hohndel.org>
| -rw-r--r-- | git-access.c | 1 |
1 files changed, 1 insertions, 0 deletions
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)) |