From a943ccf10ecf2af3331927cb83268fbc70f43634 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 25 Aug 2016 11:58:17 +0300
Subject: [PATCH] Change the way merge request diff compare works

* remove ref fetch (we do it during creation anyway)
* remove safe_head_commit_sha for diff compare (do not depend on the source branch)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/merge_request_diff.rb | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index e353bdb24b8..445179a4487 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -65,13 +65,6 @@ class MergeRequestDiff < ActiveRecord::Base
     start_commit_sha || merge_request.target_branch_sha
   end
 
-  # This method will rely on repository branch sha
-  # in case head_commit_sha is nil. Its necesarry for old merge request diff
-  # created before version 8.4 to work
-  def safe_head_commit_sha
-    head_commit_sha || merge_request.source_branch_sha
-  end
-
   def size
     real_size.presence || raw_diffs.size
   end
@@ -82,7 +75,7 @@ class MergeRequestDiff < ActiveRecord::Base
         Gitlab::Git::Compare.new(
           repository.raw_repository,
           safe_start_commit_sha,
-          safe_head_commit_sha).diffs(options)
+          head_commit_sha).diffs(options)
     else
       @raw_diffs ||= {}
       @raw_diffs[options] ||= load_diffs(st_diffs, options)
@@ -148,16 +141,11 @@ class MergeRequestDiff < ActiveRecord::Base
 
   def compare
     @compare ||=
-      begin
-        # Update ref for merge request
-        merge_request.fetch_ref
-
-        Gitlab::Git::Compare.new(
-          repository.raw_repository,
-          safe_start_commit_sha,
-          safe_head_commit_sha
-        )
-      end
+      Gitlab::Git::Compare.new(
+        repository.raw_repository,
+        safe_start_commit_sha,
+        head_commit_sha
+      )
   end
 
   def latest?