From ab7adbb24384387a5c46a6340ecdedc4c1481079 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 19 May 2025 17:55:40 +0200 Subject: Remove unneeded extra checks for upwards symlinks --- src/buildtool/tree_structure/tree_structure_utils.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/buildtool/tree_structure/tree_structure_utils.cpp') diff --git a/src/buildtool/tree_structure/tree_structure_utils.cpp b/src/buildtool/tree_structure/tree_structure_utils.cpp index 758e47fc..b8b9dcc3 100644 --- a/src/buildtool/tree_structure/tree_structure_utils.cpp +++ b/src/buildtool/tree_structure/tree_structure_utils.cpp @@ -14,7 +14,6 @@ #include "src/buildtool/tree_structure/tree_structure_utils.hpp" -#include #include #include #include @@ -38,7 +37,6 @@ #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/utils/cpp/hex_string.hpp" -#include "src/utils/cpp/path.hpp" #include "src/utils/cpp/tmp_dir.hpp" auto TreeStructureUtils::Compute(ArtifactDigest const& tree, @@ -65,22 +63,9 @@ auto TreeStructureUtils::Compute(ArtifactDigest const& tree, fmt::format("Failed to read content of: {}", tree.hash())}; } - auto const check_symlinks = - [&storage](std::vector const& ids) { - return std::all_of( - ids.begin(), ids.end(), [&storage](auto const& id) -> bool { - auto path_to_symlink = - storage.CAS().BlobPath(id, /*is_executable=*/false); - if (not path_to_symlink) { - return false; - } - auto const content = - FileSystemManager::ReadFile(*path_to_symlink); - return content and PathIsNonUpwards(*content); - }); - }; + auto skip_symlinks = [](auto const& /*unused*/) { return true; }; auto const entries = GitRepo::ReadTreeData( - *tree_content, tree.hash(), check_symlinks, /*is_hex_id=*/true); + *tree_content, tree.hash(), skip_symlinks, /*is_hex_id=*/true); if (not entries) { return unexpected{ fmt::format("Failed to parse git tree: {}", tree.hash())}; -- cgit v1.2.3