summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-13 15:27:30 +0000
committerRémy Coutable <remy@rymai.me>2018-06-13 15:27:30 +0000
commitc102f956d82cc389f3e1d13ad68564602e8ab78f (patch)
treea2e7ca9951237e7db5ba7066744844664e5107e3 /lib
parent84b7613ff23fc7452a8a76ed8e45eb9b231997ed (diff)
parente4a9b0771abdcd4e478cfc763ca7fcecc99ae505 (diff)
downloadgitlab-ce-c102f956d82cc389f3e1d13ad68564602e8ab78f.tar.gz
Merge branch 'zj-empty-batch-no-rpc' into 'master'
ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gitaly_client/commit_service.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index a4cc64de80d..7f2e6441f16 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -179,6 +179,8 @@ module Gitlab
end
def list_commits_by_oid(oids)
+ return [] if oids.empty?
+
request = Gitaly::ListCommitsByOidRequest.new(repository: @gitaly_repo, oid: oids)
response = GitalyClient.call(@repository.storage, :commit_service, :list_commits_by_oid, request, timeout: GitalyClient.medium_timeout)