diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-01-21 21:23:22 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-01-21 21:23:22 +0300 |
| commit | d273a350a6f25ef2de56c111695366c278df7495 (patch) | |
| tree | 9df0ba498fa2f267fa23e9c6a96799d3563f0726 | |
| parent | f63adf19271e150a338eb90479b7afeb94340ed9 (diff) | |
| parent | bac0ab458df529dd8683fa9613b9f48091c22ac4 (diff) | |
Merge branch 'jv-rename-remote-mirror-variable' into 'master'
Rename {ref,remote}_name in Gitlab::Git::RemoteMirror
See merge request gitlab-org/gitaly!1774
| -rw-r--r-- | ruby/lib/gitlab/git/remote_mirror.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ruby/lib/gitlab/git/remote_mirror.rb b/ruby/lib/gitlab/git/remote_mirror.rb index 9b5cf3180..f1f110dfb 100644 --- a/ruby/lib/gitlab/git/remote_mirror.rb +++ b/ruby/lib/gitlab/git/remote_mirror.rb @@ -1,11 +1,11 @@ module Gitlab module Git class RemoteMirror - attr_reader :repository, :ref_name, :ssh_auth, :only_branches_matching + attr_reader :repository, :remote_name, :ssh_auth, :only_branches_matching - def initialize(repository, ref_name, ssh_auth:, only_branches_matching: []) + def initialize(repository, remote_name, ssh_auth:, only_branches_matching: []) @repository = repository - @ref_name = ref_name + @remote_name = remote_name @ssh_auth = ssh_auth @only_branches_matching = only_branches_matching end @@ -17,7 +17,7 @@ module Gitlab delete_refs(local_branches, remote_branches, env: env) local_tags = refs_obj(repository.tags) - remote_tags = refs_obj(repository.remote_tags(ref_name, env: env)) + remote_tags = refs_obj(repository.remote_tags(remote_name, env: env)) updated_tags = changed_refs(local_tags, remote_tags) push_refs(updated_tags.keys, env: env) @@ -42,7 +42,7 @@ module Gitlab def remote_branches @remote_branches ||= refs_obj( - repository.remote_branches(ref_name), + repository.remote_branches(remote_name), match_refs: true ) end @@ -77,7 +77,7 @@ module Gitlab def push_refs(refs, env:) return unless refs.present? - repository.push_remote_branches(ref_name, refs, env: env) + repository.push_remote_branches(remote_name, refs, env: env) end def delete_refs(local_refs, remote_refs, env:) @@ -85,7 +85,7 @@ module Gitlab return unless refs.present? - repository.delete_remote_branches(ref_name, refs.keys, env: env) + repository.delete_remote_branches(remote_name, refs.keys, env: env) end def refs_to_delete(local_refs, remote_refs) |