Support ref path in merge_to_ref

6 files changed, 48 insertions, 22 deletions

diff --git a/ruby/Gemfile b/ruby/Gemfile
index 1ad7f4c77..1a6eb99b6 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 6.1', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.0'
 gem 'activesupport', '~> 5.1.7'
-gem 'gitaly-proto', '~> 1.32.0'
+gem 'gitaly-proto', '~> 1.36.0'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 852b3f332..604b48429 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     ffi (1.10.0)
     gemojione (3.3.0)
       json
-    gitaly-proto (1.32.0)
+    gitaly-proto (1.36.0)
       grpc (~> 1.0)
     github-linguist (6.4.1)
       charlock_holmes (~> 0.7.6)
@@ -217,7 +217,7 @@ DEPENDENCIES
   bundler (>= 1.17.3)
   factory_bot
   faraday (~> 0.12)
-  gitaly-proto (~> 1.32.0)
+  gitaly-proto (~> 1.36.0)
   github-linguist (~> 6.1)
   gitlab-gollum-lib (~> 4.2.7.7)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index 4243b77c7..89655fb3f 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -99,7 +99,7 @@ module GitalyServer
       repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
       user = Gitlab::Git::User.from_gitaly(request.user)
 
-      commit_id = repo.merge_to_ref(user, request.source_sha, request.branch, request.target_ref, request.message.dup)
+      commit_id = repo.merge_to_ref(user, request.source_sha, request.branch, request.target_ref, request.message.dup, request.first_parent_ref)
 
       Gitaly::UserMergeToRefResponse.new(commit_id: commit_id)
     rescue Gitlab::Git::CommitError => e
diff --git a/ruby/lib/gitlab/git/operation_service.rb b/ruby/lib/gitlab/git/operation_service.rb
index 6530ef342..f011f1aaa 100644
--- a/ruby/lib/gitlab/git/operation_service.rb
+++ b/ruby/lib/gitlab/git/operation_service.rb
@@ -107,18 +107,18 @@ module Gitlab
       # Returns the generated commit.
       #
       # ref - The target ref path we're committing to.
-      # from_branch - The branch we're taking the HEAD commit from.
-      def commit_ref(ref, from_branch:)
+      # from_ref - The ref we're taking the HEAD commit from.
+      def commit_ref(ref, from_ref:)
         update_autocrlf_option
 
-        repository.write_ref(ref, from_branch.target)
+        repository.write_ref(ref, from_ref.target)
 
         # Make commit
         newrev = yield
 
         raise Gitlab::Git::CommitError.new('Failed to create commit') unless newrev
 
-        oldrev = from_branch.target
+        oldrev = from_ref.target
 
         update_ref(ref, newrev, oldrev)
 
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index b7b1797ab..66b545084 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -267,13 +267,17 @@ module Gitlab
         tags.find { |tag| tag.name.b == name_b }
       end
 
-      def merge_to_ref(user, source_sha, branch, target_ref, message)
-        branch = find_branch(branch)
+      def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref)
+        ref = if first_parent_ref.present?
+                find_ref(first_parent_ref)
+              else
+                find_branch(branch)
+              end
 
-        raise InvalidRef unless branch
+        raise InvalidRef unless ref
 
-        OperationService.new(user, self).commit_ref(target_ref, from_branch: branch) do
-          our_commit = branch.target
+        OperationService.new(user, self).commit_ref(target_ref, from_ref: ref) do
+          our_commit = ref.target
           their_commit = source_sha
 
           create_merge_commit(user, our_commit, their_commit, message)
@@ -548,6 +552,14 @@ module Gitlab
         end
       end
 
+      def find_ref(name)
+        rugged_ref = rugged.references[name]
+
+        return unless rugged_ref
+
+        Gitlab::Git::Ref.new(self, rugged_ref.name, rugged_ref.target, rugged_ref.target_id)
+      end
+
       # Delete the specified branch from the repository
       def delete_branch(branch_name)
         rugged.branches.delete(branch_name)
diff --git a/ruby/spec/lib/gitlab/git/repository_spec.rb b/ruby/spec/lib/gitlab/git/repository_spec.rb
index 6c056efc8..672c95361 100644
--- a/ruby/spec/lib/gitlab/git/repository_spec.rb
+++ b/ruby/spec/lib/gitlab/git/repository_spec.rb
@@ -389,7 +389,10 @@ describe Gitlab::Git::Repository do # rubocop:disable Metrics/BlockLength
     let(:branch_head) { '6d394385cf567f80a8fd85055db1ab4c5295806f' }
     let(:source_sha) { 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660' }
     let(:branch) { 'test-master' }
+    let(:first_parent_ref) { 'refs/heads/test-master' }
     let(:target_ref) { 'refs/merge-requests/999/merge' }
+    let(:arg_branch) {}
+    let(:arg_first_parent_ref) { first_parent_ref }
 
     before do
       create_branch(repository, branch, branch_head)
@@ -399,20 +402,31 @@ describe Gitlab::Git::Repository do # rubocop:disable Metrics/BlockLength
       repository.rugged.references[target_ref]
     end
 
-    it 'changes target ref to a merge between source SHA and branch' do
-      expect(fetch_target_ref).to be_nil
+    shared_examples_for 'correct behavior' do
+      it 'changes target ref to a merge between source SHA and branch' do
+        expect(fetch_target_ref).to be_nil
 
-      merge_commit_id = repository.merge_to_ref(user, source_sha, branch, target_ref, 'foo')
+        merge_commit_id = repository.merge_to_ref(user, source_sha, arg_branch, target_ref, 'foo', arg_first_parent_ref)
 
-      ref = fetch_target_ref
+        ref = fetch_target_ref
 
-      expect(ref.target.oid).to eq(merge_commit_id)
+        expect(ref.target.oid).to eq(merge_commit_id)
+      end
+
+      it 'does not change the branch HEAD' do
+        expect { repository.merge_to_ref(user, source_sha, arg_branch, target_ref, 'foo', arg_first_parent_ref) }
+          .not_to change { repository.find_ref(first_parent_ref).target }
+          .from(branch_head)
+      end
     end
 
-    it 'does not change the branch HEAD' do
-      expect { repository.merge_to_ref(user, source_sha, branch, target_ref, 'foo') }
-        .not_to change { repository.find_branch(branch).target }
-        .from(branch_head)
+    it_behaves_like 'correct behavior'
+
+    context 'when legacy branch parameter is specified and ref path is empty' do
+      it_behaves_like 'correct behavior' do
+        let(:arg_branch) { branch }
+        let(:arg_first_parent_ref) {}
+      end
     end
   end