Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into 'master'
Fix error when deleting an empty list of refs Closes #45743 See merge request gitlab-org/gitlab-ce!19053
This commit is contained in:
commit
ad9e00917f
3 changed files with 10 additions and 1 deletions
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix error when deleting an empty list of refs
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -2367,7 +2367,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def gitaly_delete_refs(*ref_names)
|
||||
gitaly_ref_client.delete_refs(refs: ref_names)
|
||||
gitaly_ref_client.delete_refs(refs: ref_names) if ref_names.any?
|
||||
end
|
||||
|
||||
def rugged_remove_remote(remote_name)
|
||||
|
|
|
@ -600,6 +600,10 @@ describe Gitlab::Git::Repository, seed_helper: true do
|
|||
end
|
||||
end
|
||||
|
||||
it 'does not fail when deleting an empty list of refs' do
|
||||
expect { repo.delete_refs(*[]) }.not_to raise_error
|
||||
end
|
||||
|
||||
it 'raises an error if it failed' do
|
||||
expect { repo.delete_refs('refs\heads\fix') }.to raise_error(Gitlab::Git::Repository::GitError)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue