Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master'
Prepare Gitlab::Git::Repository#rebase for Gitaly migration See merge request gitlab-org/gitlab-ce!16192
This commit is contained in:
commit
4dd0c55f05
2 changed files with 13 additions and 1 deletions
|
@ -97,6 +97,11 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
|
||||
def update_branch(branch_name, newrev, oldrev)
|
||||
ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name
|
||||
update_ref_in_hooks(ref, newrev, oldrev)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Returns [newrev, should_run_after_create, should_run_after_create_branch]
|
||||
|
|
|
@ -1219,9 +1219,16 @@ module Gitlab
|
|||
rebase_path = worktree_path(REBASE_WORKTREE_PREFIX, rebase_id)
|
||||
env = git_env_for_user(user)
|
||||
|
||||
if remote_repository.is_a?(RemoteRepository)
|
||||
env.merge!(remote_repository.fetch_env)
|
||||
remote_repo_path = GITALY_INTERNAL_URL
|
||||
else
|
||||
remote_repo_path = remote_repository.path
|
||||
end
|
||||
|
||||
with_worktree(rebase_path, branch, env: env) do
|
||||
run_git!(
|
||||
%W(pull --rebase #{remote_repository.path} #{remote_branch}),
|
||||
%W(pull --rebase #{remote_repo_path} #{remote_branch}),
|
||||
chdir: rebase_path, env: env
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue