diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 15:08:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 15:08:01 +0000 |
commit | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (patch) | |
tree | 66501ec0de9f529ee1cfc7cd6c4b481b1fc76662 /spec/lib/gitlab/git | |
parent | 684d65316ac77c62f47d68b9926eea8af30db227 (diff) | |
download | gitlab-ce-53b1f4eaa2a451aaba908a5fee7ce97a930021ac.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/git')
-rw-r--r-- | spec/lib/gitlab/git/remote_mirror_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/git/remote_mirror_spec.rb b/spec/lib/gitlab/git/remote_mirror_spec.rb index 9744562b51b..edef91b8bc6 100644 --- a/spec/lib/gitlab/git/remote_mirror_spec.rb +++ b/spec/lib/gitlab/git/remote_mirror_spec.rb @@ -7,14 +7,14 @@ describe Gitlab::Git::RemoteMirror do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:ref_name) { 'foo' } - let(:options) { { only_branches_matching: ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS' } } + let(:options) { { only_branches_matching: ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS', keep_divergent_refs: true } } subject(:remote_mirror) { described_class.new(repository, ref_name, **options) } it 'delegates to the Gitaly client' do expect(repository.gitaly_remote_client) .to receive(:update_remote_mirror) - .with(ref_name, ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS') + .with(ref_name, ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS', keep_divergent_refs: true) remote_mirror.update end |