Store diff head and start commit shas on MR diffs

app/models/merge_request_diff.rb

@@ -24,7 +24,7 @@ class MergeRequestDiff < ActiveRecord::Base
   serialize :st_diffs
 
   after_create :reload_content, unless: :importing?
-  after_save :keep_around_commit
+  after_save :keep_around_commits
 
   def reload_content
     reload_commits
@@ -147,12 +147,13 @@ def reload_diffs
 
     new_attributes[:st_diffs] = new_diffs
 
-    base_commit_sha = self.repository.merge_base(self.head, self.base)
-    new_attributes[:base_commit_sha] = base_commit_sha
-
-    self.repository.keep_around(base_commit_sha)
+    new_attributes[:start_commit_sha] = self.target_branch_sha
+    new_attributes[:head_commit_sha] = self.source_branch_sha
+    new_attributes[:base_commit_sha] = branch_base_sha
 
     update_columns_serialized(new_attributes)
+
+    keep_around_commits
   end
 
   # Collect array of Git::Diff objects
@@ -223,7 +224,9 @@ def update_columns_serialized(new_attributes)
     reload
   end
 
-  def keep_around_commit
-    self.repository.keep_around(self.base_commit_sha)
+  def keep_around_commits
+    self.repository.keep_around(target_branch_sha)
+    self.repository.keep_around(source_branch_sha)
+    self.repository.keep_around(branch_base_sha)
   end
 end

db/migrate/20160508202603_add_head_commit_id_to_merge_request_diffs.rb

@@ -0,0 +1,5 @@
+class AddHeadCommitIdToMergeRequestDiffs < ActiveRecord::Migration
+  def change
+    add_column :merge_request_diffs, :head_commit_sha, :string
+  end
+end

db/migrate/20160516224534_add_start_commit_id_to_merge_request_diffs.rb

@@ -0,0 +1,5 @@
+class AddStartCommitIdToMergeRequestDiffs < ActiveRecord::Migration
+  def change
+    add_column :merge_request_diffs, :start_commit_sha, :string
+  end
+end