Skip to content
Snippets Groups Projects
Commit c6ff7bfa authored by Alejandro Rodríguez's avatar Alejandro Rodríguez
Browse files

Move git calls for `Repository#update_branch` inside Gitlab::Git

This prepares this code for migration to Gitaly.
parent dd949b0b
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -684,6 +684,10 @@ module Gitlab
end
end
 
def update_branch(branch_name, user:, newrev:, oldrev:)
OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
end
def rm_branch(branch_name, user:)
gitaly_migrate(:operation_user_delete_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
Loading
Loading
@@ -1953,8 +1957,7 @@ module Gitlab
 
rebase_sha = run_git!(%w(rev-parse HEAD), chdir: rebase_path, env: env).strip
 
Gitlab::Git::OperationService.new(user, self)
.update_branch(branch, rebase_sha, branch_sha)
update_branch(branch, user: user, newrev: rebase_sha, oldrev: branch_sha)
 
rebase_sha
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment