Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflicts

2 files changed, 17 insertions, 10 deletions

diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb
index 3ab4ef4adfb..d16e45c964d 100644
--- a/lib/gitlab/gitaly_client/conflicts_service.rb
+++ b/lib/gitlab/gitaly_client/conflicts_service.rb
@@ -65,8 +65,8 @@ module Gitlab
           our_commit_oid: @our_commit_oid,
           target_repository: target_repository.gitaly_repository,
           their_commit_oid: @their_commit_oid,
-          source_branch: source_branch,
-          target_branch: target_branch,
+          source_branch: encode_binary(source_branch),
+          target_branch: encode_binary(target_branch),
           commit_message: encode_binary(resolution.commit_message),
           user: Gitlab::Git::User.from_gitlab(resolution.user).to_gitaly
         )
diff --git a/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb b/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb
index a8a6830ee2d..52630ba0223 100644
--- a/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb
@@ -51,16 +51,23 @@ describe Gitlab::GitalyClient::ConflictsService do
       subject
     end
 
-    it 'handles commit messages with UTF-8 characters' do
-      allow(::Gitlab::GitalyClient).to receive(:call).and_call_original
-      expect(::Gitlab::GitalyClient).to receive(:call).with(anything, :conflicts_service, :resolve_conflicts, any_args) do |*args|
-        # Force the generation of request messages by iterating through the enumerator
-        args[3].to_a
+    context 'with branches with UTF-8 characters' do
+      let(:source_branch) { 'testòbranch' }
+      let(:target_branch) { 'ábranch' }
 
-        double(resolution_error: nil)
-      end
+      it 'handles commit messages with UTF-8 characters' do
+        allow(::Gitlab::GitalyClient).to receive(:call).and_call_original
+        expect(::Gitlab::GitalyClient).to receive(:call).with(anything, :conflicts_service, :resolve_conflicts, any_args) do |*args|
+          # Force the generation of request messages by iterating through the enumerator
+          message = args[3].to_a.first
+          params = [message.header.commit_message, message.header.source_branch, message.header.target_branch]
+          expect(params.map(&:encoding).uniq).to eq([Encoding::ASCII_8BIT])
 
-      subject
+          double(resolution_error: nil)
+        end
+
+        subject
+      end
     end
 
     it 'raises a relevant exception if resolution_error is present' do