Use Repository#fetch_ref

1 files changed, 7 insertions, 2 deletions

diff --git a/app/services/merge_requests/resolve_service.rb b/app/services/merge_requests/resolve_service.rb
index bd8b9f8cfd4..19caa038c44 100644
--- a/app/services/merge_requests/resolve_service.rb
+++ b/app/services/merge_requests/resolve_service.rb
@@ -38,8 +38,13 @@ module MergeRequests
     def fetch_their_commit!
       return if rugged.include?(conflicts.their_commit.oid)
 
-      remote = rugged.remotes.create_anonymous(merge_request.target_project.repository.path_to_repo)
-      remote.fetch(merge_request.target_branch)
+      random_string = SecureRandom.hex
+
+      project.repository.fetch_ref(
+        merge_request.target_project.repository.path_to_repo,
+        "refs/heads/#{merge_request.target_branch}",
+        "refs/tmp/#{random_string}/head"
+      )
     end
   end
 end