Use Repository#fetch_ref

2016-08-30 16:23:45 +01:00 · 2016-08-30 16:23:45 +01:00 · 59dd9e576b
parent 1bda1e62de
commit 59dd9e576b
1 changed files with 7 additions and 2 deletions
--- 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