From c36b8f3d79269daa7d066150d0790ed0f383426a Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 29 Jan 2018 14:37:03 +0100 Subject: [PATCH] git: use force branch checkout to prevent cases when .gitattributes modifies files by specific rule and then checkout is blocked by potential file conflicts. --- rhodecode/lib/vcs/backends/git/repository.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py index 94fd6a73..402fae87 100644 --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -900,10 +900,10 @@ class GitRepository(BaseRepository): # fetch proper commits for merge testing if source_ref.name != target_ref.name: if shadow_repo.get_remote_ref(source_ref.name): - shadow_repo._checkout(source_ref.name) + shadow_repo._checkout(source_ref.name, force=True) # checkout target - shadow_repo._checkout(target_ref.name) + shadow_repo._checkout(target_ref.name, force=True) shadow_repo._local_pull(self.path, target_ref.name) # Need to reload repo to invalidate the cache, or otherwise we cannot