Add latest changes from gitlab-org/gitlab@14-6-stable-ee

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index 11510daf9c0..de342444c15 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -486,6 +486,16 @@ RSpec.describe Gitlab::Git::Commit, :seed_helper do
           expect(commits.first.sha).to eq(SeedRepo::Commit::ID)
           expect(commits.second.sha).to eq(SeedRepo::FirstCommit::ID)
         end
+
+        context 'when repo does not exist' do
+          let(:no_repository) { Gitlab::Git::Repository.new('default', '@does-not-exist/project', '', 'bogus/project') }
+
+          it 'returns empty commits' do
+            commits = described_class.batch_by_oid(no_repository, oids)
+
+            expect(commits.count).to eq(0)
+          end
+        end
       end
 
       context 'when oids is empty' do