summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-10-03 16:56:03 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-10-03 16:56:03 +0200
commit60092596728115c601fc7714f5c08609e0f846cf (patch)
tree64c10ac418e7468c0b3f38ff5d71910d662a86d9
parent8c85aa692c34992c527f3807f4ded2f16e98625d (diff)
downloadgitlab-ce-gitaly-fetch-ref.tar.gz
Rename private methodsgitaly-fetch-ref
-rw-r--r--lib/gitlab/git/repository.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index c5d801d8a38..b99385768f6 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1035,9 +1035,9 @@ module Gitlab
def fetch_ref(source_repository, source_ref:, target_ref:)
message, status = GitalyClient.migrate(:fetch_ref) do |is_enabled|
if is_enabled
- fetch_ref_gitaly(source_repository, source_ref: source_ref, target_ref: target_ref)
+ gitaly_fetch_ref(source_repository, source_ref: source_ref, target_ref: target_ref)
else
- fetch_ref_local(source_repository.path, source_ref: source_ref, target_ref: target_ref)
+ local_fetch_ref(source_repository.path, source_ref: source_ref, target_ref: target_ref)
end
end
@@ -1491,12 +1491,12 @@ module Gitlab
end
end
- def fetch_ref_local(source_path, source_ref:, target_ref:)
+ def local_fetch_ref(source_path, source_ref:, target_ref:)
args = %W(fetch --no-tags -f #{source_path} #{source_ref}:#{target_ref})
run_git(args)
end
- def fetch_ref_gitaly(source_repository, source_ref:, target_ref:)
+ def gitaly_fetch_ref(source_repository, source_ref:, target_ref:)
gitaly_ssh = File.absolute_path(File.join(Gitlab.config.gitaly.client_path, 'gitaly-ssh'))
gitaly_address = gitaly_resolver.address(source_repository.storage)
gitaly_token = gitaly_resolver.token(source_repository.storage)