From c889b852a652115f4a6936a96ebdee9410571997 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 19 Aug 2024 16:01:16 +0200 Subject: GitOps: Pass source directory to GitInitialCommit operation While there, ensure optional Git operation parameters are checked before use for the operations that require them. --- src/other_tools/ops_maps/content_cas_map.cpp | 1 + src/other_tools/ops_maps/git_tree_fetch_map.cpp | 2 ++ src/other_tools/ops_maps/import_to_git_map.cpp | 2 ++ 3 files changed, 5 insertions(+) (limited to 'src/other_tools/ops_maps') diff --git a/src/other_tools/ops_maps/content_cas_map.cpp b/src/other_tools/ops_maps/content_cas_map.cpp index 0c6ccd25..95518326 100644 --- a/src/other_tools/ops_maps/content_cas_map.cpp +++ b/src/other_tools/ops_maps/content_cas_map.cpp @@ -138,6 +138,7 @@ auto CreateContentCASMap( storage_config->GitRoot(), // target_path "", // git_hash std::nullopt, // message + std::nullopt, // source_path true // init_bare }, .op_type = GitOpType::ENSURE_INIT}; diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp index cceda079..7a4d9e0a 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp @@ -272,6 +272,7 @@ auto CreateGitTreeFetchMap( storage_config->GitRoot(), // target_path "", // git_hash std::nullopt, // message + std::nullopt, // source_path true // init_bare }, .op_type = GitOpType::ENSURE_INIT}; @@ -457,6 +458,7 @@ auto CreateGitTreeFetchMap( "", // git_hash fmt::format("Content of tree {}", key.hash), // message + tmp_dir->GetPath() // source_path }, .op_type = GitOpType::INITIAL_COMMIT}; critical_git_op_map->ConsumeAfterKeysReady( diff --git a/src/other_tools/ops_maps/import_to_git_map.cpp b/src/other_tools/ops_maps/import_to_git_map.cpp index 7e9331b0..e883e0dd 100644 --- a/src/other_tools/ops_maps/import_to_git_map.cpp +++ b/src/other_tools/ops_maps/import_to_git_map.cpp @@ -109,6 +109,7 @@ auto CreateImportToGitMap( fmt::format("Content of {} {}", key.repo_type, key.content), // message + key.target_path // source_path }, .op_type = GitOpType::INITIAL_COMMIT}; critical_git_op_map->ConsumeAfterKeysReady( @@ -137,6 +138,7 @@ auto CreateImportToGitMap( storage_config->GitRoot(), // target_path "", // git_hash std::nullopt, // message + std::nullopt, // source_path true // init_bare }, .op_type = GitOpType::ENSURE_INIT}; -- cgit v1.2.3