Commit fcc03152 authored by Robert Speicher's avatar Robert Speicher

Add keep_divergent_refs to Git::RemoteMirror

This receives the flag from `RemoteMirror#update_repository` and passes
the flag to the Gitaly client.
parent 0a3548df
...@@ -5,14 +5,15 @@ module Gitlab ...@@ -5,14 +5,15 @@ module Gitlab
class RemoteMirror class RemoteMirror
include Gitlab::Git::WrapsGitalyErrors include Gitlab::Git::WrapsGitalyErrors
attr_reader :repository, :ref_name, :only_branches_matching, :ssh_key, :known_hosts attr_reader :repository, :ref_name, :only_branches_matching, :ssh_key, :known_hosts, :keep_divergent_refs
def initialize(repository, ref_name, only_branches_matching: [], ssh_key: nil, known_hosts: nil) def initialize(repository, ref_name, only_branches_matching: [], ssh_key: nil, known_hosts: nil, keep_divergent_refs: false)
@repository = repository @repository = repository
@ref_name = ref_name @ref_name = ref_name
@only_branches_matching = only_branches_matching @only_branches_matching = only_branches_matching
@ssh_key = ssh_key @ssh_key = ssh_key
@known_hosts = known_hosts @known_hosts = known_hosts
@keep_divergent_refs = keep_divergent_refs
end end
def update def update
...@@ -21,7 +22,8 @@ module Gitlab ...@@ -21,7 +22,8 @@ module Gitlab
ref_name, ref_name,
only_branches_matching, only_branches_matching,
ssh_key: ssh_key, ssh_key: ssh_key,
known_hosts: known_hosts known_hosts: known_hosts,
keep_divergent_refs: keep_divergent_refs
) )
end end
end end
......
...@@ -7,14 +7,14 @@ describe Gitlab::Git::RemoteMirror do ...@@ -7,14 +7,14 @@ describe Gitlab::Git::RemoteMirror do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:repository) { project.repository } let(:repository) { project.repository }
let(:ref_name) { 'foo' } 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) } subject(:remote_mirror) { described_class.new(repository, ref_name, **options) }
it 'delegates to the Gitaly client' do it 'delegates to the Gitaly client' do
expect(repository.gitaly_remote_client) expect(repository.gitaly_remote_client)
.to receive(:update_remote_mirror) .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 remote_mirror.update
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment