Commit 707225fa authored by Alejandro Rodríguez's avatar Alejandro Rodríguez

Use repo subdirectories for worktrees

This allows us to not depend on Gitaly configuration, which will make
things easier for the Gitaly migration.
parent 5ac71714
......@@ -1369,11 +1369,11 @@ module Gitlab
end
def rebase_dir_path(id)
File.join(::Gitlab.config.shared.path, 'tmp/rebase', gl_repository, id.to_s).to_s
File.join(path, 'gitlab-worktree', "rebase-#{id}")
end
def squash_dir_path(id)
File.join(::Gitlab.config.shared.path, 'tmp/squash', gl_repository, id.to_s).to_s
File.join(path, 'gitlab-worktree', "squash-#{id}")
end
def git_env_for_user(user)
......
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