Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'

Fix encoding bug in Gitaly::Commit::TreeEntry

Closes #46445 and gitaly#1208

See merge request gitlab-org/gitlab-ce!19243

6 files changed, 13 insertions, 5 deletions

diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index 1f5f88bf792..a4cc64de80d 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -78,7 +78,7 @@ module Gitlab
       def tree_entry(ref, path, limit = nil)
         request = Gitaly::TreeEntryRequest.new(
           repository: @gitaly_repo,
-          revision: ref,
+          revision: encode_binary(ref),
           path: encode_binary(path),
           limit: limit.to_i
         )
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb
index e2547ed0311..94eaf86ef80 100644
--- a/spec/lib/gitlab/git/blob_spec.rb
+++ b/spec/lib/gitlab/git/blob_spec.rb
@@ -22,6 +22,12 @@ describe Gitlab::Git::Blob, seed_helper: true do
       it { expect(blob).to eq(nil) }
     end
 
+    context 'utf-8 branch' do
+      let(:blob) { Gitlab::Git::Blob.find(repository, 'Ääh-test-utf-8', "files/ruby/popen.rb")}
+
+      it { expect(blob.id).to eq(SeedRepo::RubyBlob::ID) }
+    end
+
     context 'blank path' do
       let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, '') }
 
diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index 08c6d1e55e9..89be8a1b7f2 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -603,8 +603,8 @@ describe Gitlab::Git::Commit, seed_helper: true do
     let(:commit) { described_class.find(repository, 'master') }
     subject { commit.ref_names(repository) }
 
-    it 'has 1 element' do
-      expect(subject.size).to eq(1)
+    it 'has 2 element' do
+      expect(subject.size).to eq(2)
     end
     it { is_expected.to include("master") }
     it { is_expected.not_to include("feature") }
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index af6a486ab20..dd5c498706d 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1374,7 +1374,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
 
   describe '#branch_count' do
     it 'returns the number of branches' do
-      expect(repository.branch_count).to eq(10)
+      expect(repository.branch_count).to eq(11)
     end
 
     context 'with local and remote branches' do
@@ -2248,7 +2248,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
 
   describe '#checksum' do
     it 'calculates the checksum for non-empty repo' do
-      expect(repository.checksum).to eq '54f21be4c32c02f6788d72207fa03ad3bce725e4'
+      expect(repository.checksum).to eq '4be7d24ce7e8d845502d599b72d567d23e6a40c0'
     end
 
     it 'returns 0000000000000000000000000000000000000000 for an empty repo' do
diff --git a/spec/support/gitlab-git-test.git/packed-refs b/spec/support/gitlab-git-test.git/packed-refs
index ea50e4ad3f6..6a61e5df267 100644
--- a/spec/support/gitlab-git-test.git/packed-refs
+++ b/spec/support/gitlab-git-test.git/packed-refs
@@ -9,6 +9,7 @@
 4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/master
 5937ac0a7beb003549fc5fd26fc247adbce4a52e refs/heads/merge-test
 9596bc54a6f0c0c98248fe97077eb5ccf48a98d0 refs/heads/missing-gitmodules
+4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/Ääh-test-utf-8
 f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 refs/tags/v1.0.0
 ^6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
 8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b refs/tags/v1.1.0
diff --git a/spec/support/helpers/seed_repo.rb b/spec/support/helpers/seed_repo.rb
index b4868e82cd7..71f1a86b0c1 100644
--- a/spec/support/helpers/seed_repo.rb
+++ b/spec/support/helpers/seed_repo.rb
@@ -98,6 +98,7 @@ module SeedRepo
       master
       merge-test
       missing-gitmodules
+      Ääh-test-utf-8
     ].freeze
     TAGS = %w[
       v1.0.0