From d99d5198c2df6f931664b8096bcbfc28e8221145 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 8 Aug 2016 23:00:11 +0300
Subject: [PATCH] Add MergeRequest#branch_merge_base_commit method

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/merge_request.rb       | 35 ++++++++++++++++++++++++-------
 spec/models/merge_request_spec.rb | 17 +++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 56d5157298f..7e3444882ea 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -177,8 +177,8 @@ class MergeRequest < ActiveRecord::Base
   def diff_base_commit
     if persisted?
       merge_request_diff.base_commit
-    elsif diff_start_commit && diff_head_commit
-      self.target_project.merge_base_commit(diff_start_sha, diff_head_sha)
+    else
+      branch_merge_base_commit
     end
   end
 
@@ -239,6 +239,15 @@ class MergeRequest < ActiveRecord::Base
     target_project.repository.commit(target_branch) if target_branch_ref
   end
 
+  def branch_merge_base_commit
+    start_sha = target_branch_sha
+    head_sha  = source_branch_sha
+
+    if start_sha && head_sha
+      target_project.merge_base_commit(start_sha, head_sha)
+    end
+  end
+
   def target_branch_sha
     @target_branch_sha || target_branch_head.try(:sha)
   end
@@ -247,15 +256,25 @@ class MergeRequest < ActiveRecord::Base
     @source_branch_sha || source_branch_head.try(:sha)
   end
 
+  def branch_merge_base_sha
+    branch_merge_base_commit.try(:sha)
+  end
+
   def diff_refs
     if merge_request_diff
       merge_request_diff.diff_refs
-    elsif diff_start_commit || diff_base_commit
-      Gitlab::Diff::DiffRefs.new(
-        base_sha:  diff_base_sha,
-        start_sha: diff_start_sha,
-        head_sha:  diff_head_sha
-      )
+    else
+      start_sha = target_branch_sha
+      head_sha = source_branch_sha
+      base_sha = branch_merge_base_sha
+
+      if start_sha || base_sha
+        Gitlab::Diff::DiffRefs.new(
+          base_sha:  base_sha,
+          start_sha: start_sha,
+          head_sha:  head_sha
+        )
+      end
     end
   end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index eb382f9ef84..d32bec53a28 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -691,4 +691,21 @@ describe MergeRequest, models: true do
       subject.reload_diff
     end
   end
+
+  describe '#branch_merge_base_commit' do
+    context 'source and target branch exist' do
+      it { expect(subject.branch_merge_base_commit.sha).to eq('ae73cb07c9eeaf35924a10f713b364d32b2dd34f') }
+      it { expect(subject.branch_merge_base_commit).to be_a(Commit) }
+    end
+
+    context 'when the target branch does not exist' do
+      before do
+        subject.project.repository.raw_repository.delete_branch(subject.target_branch)
+      end
+
+      it 'returns nil' do
+        expect(subject.branch_merge_base_commit).to be_nil
+      end
+    end
+  end
 end