From 5bc6265b2ffe43370b4cddd0a9e4c09b059ef131 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 26 Jun 2024 16:07:58 +0200 Subject: Pass StorageConfig to git_repo and git_repo_remote --- src/buildtool/file_system/git_repo.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/buildtool/file_system/git_repo.cpp') diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp index 93c763ae..79708d2c 100644 --- a/src/buildtool/file_system/git_repo.cpp +++ b/src/buildtool/file_system/git_repo.cpp @@ -23,7 +23,6 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/path.hpp" @@ -1701,7 +1700,8 @@ auto GitRepo::GetObjectByPathFromTree(std::string const& tree_id, #endif // BOOTSTRAP_BUILD_TOOL } -auto GitRepo::LocalFetchViaTmpRepo(std::string const& repo_path, +auto GitRepo::LocalFetchViaTmpRepo(StorageConfig const& storage_config, + std::string const& repo_path, std::optional const& branch, anon_logger_ptr const& logger) noexcept -> bool { @@ -1714,8 +1714,7 @@ auto GitRepo::LocalFetchViaTmpRepo(std::string const& repo_path, Logger::Log(LogLevel::Debug, "Branch local fetch called on a real repository"); } - auto tmp_dir = - StorageConfig::Instance().CreateTypedTmpDir("local_fetch"); + auto tmp_dir = storage_config.CreateTypedTmpDir("local_fetch"); if (not tmp_dir) { (*logger)("Failed to create temp dir for Git repository", /*fatal=*/true); -- cgit v1.2.3