Refactor compare and fetch logic

1 files changed, 13 insertions, 20 deletions

diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb
index 4c8b35edff8..70f642baaaa 100644
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
@@ -3,33 +3,26 @@ require 'securerandom'
 # Compare 2 branches for one repo or between repositories
 # and return Gitlab::CompareResult object that responds to commits and diffs
 class CompareService
-  def execute(current_user, source_project, source_branch, target_project, target_branch)
-    # Try to compare branches to get commits list and diffs
-    if target_project == source_project
-      Gitlab::CompareResult.new(
-        Gitlab::Git::Compare.new(
-          target_project.repository.raw_repository,
-          target_branch,
-          source_branch,
-        )
-      )
-    else
+  def execute(source_project, source_branch, target_project, target_branch)
+    source_sha = source_project.commit(source_branch).sha
+
+    # If compare with other project we need to fetch ref first
+    unless target_project == source_project
       random_string = SecureRandom.hex
+
       target_project.repository.fetch_ref(
         source_project.repository.path_to_repo,
         "refs/heads/#{source_branch}",
         "refs/tmp/#{random_string}/head"
       )
+    end
 
-      source_sha = source_project.commit(source_branch).sha
-
-      Gitlab::CompareResult.new(
-        Gitlab::Git::Compare.new(
-          target_project.repository.raw_repository,
-          target_branch,
-          source_sha,
-        )
+    Gitlab::CompareResult.new(
+      Gitlab::Git::Compare.new(
+        target_project.repository.raw_repository,
+        target_branch,
+        source_sha,
       )
-    end
+    )
   end
 end