From e38fcc8cfdbc9c4691022532dd2cee8dace20a1c Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 28 Sep 2017 11:11:10 +0100
Subject: Handle error when fetching ref for MR with deleted source branch

If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
---
 app/models/merge_request.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/models/merge_request.rb')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 5043711c2ea..74ea71a52c3 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -950,8 +950,6 @@ class MergeRequest < ActiveRecord::Base
       source_project.repository, source_branch) do |commit|
         if commit
           target_project.repository.write_ref(ref_path, commit.sha)
-        else
-          raise Rugged::ReferenceError, 'source repository is empty'
         end
       end
   end
-- 
cgit v1.2.1