From 95b3fcb09e94ac9f114509b205903b25a2bbd3ba Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Mon, 3 Apr 2023 16:38:54 +0200 Subject: Make git root part of the storage config In this way, we have the whole layout of the local build root consolidated in one place. Moreover, in this way, the location of the git root is also available to the build tool itself and can, e.g., be used as fallback CAS. --- src/other_tools/just_mr/utils.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/other_tools/just_mr/utils.cpp') diff --git a/src/other_tools/just_mr/utils.cpp b/src/other_tools/just_mr/utils.cpp index ca891875..d95163fa 100644 --- a/src/other_tools/just_mr/utils.cpp +++ b/src/other_tools/just_mr/utils.cpp @@ -20,10 +20,6 @@ namespace JustMR::Utils { -auto GetGitCacheRoot() noexcept -> std::filesystem::path { - return StorageConfig::BuildRoot() / "git"; -} - auto GetGitRoot(JustMR::PathsPtr const& just_mr_paths, std::string const& repo_url) noexcept -> std::filesystem::path { if (just_mr_paths->git_checkout_locations.contains(repo_url)) { @@ -37,7 +33,7 @@ auto GetGitRoot(JustMR::PathsPtr const& just_mr_paths, FileSystemManager::IsDirectory(repo_url_as_path)) { return repo_url_as_path; } - return GetGitCacheRoot(); + return StorageConfig::GitRoot(); } auto CreateTypedTmpDir(std::string const& type) noexcept -> TmpDirPtr { -- cgit v1.2.3