diff options
Diffstat (limited to 'src/other_tools/git_operations')
| -rw-r--r-- | src/other_tools/git_operations/git_ops_types.hpp | 4 | ||||
| -rw-r--r-- | src/other_tools/git_operations/git_repo_remote.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/other_tools/git_operations/git_ops_types.hpp b/src/other_tools/git_operations/git_ops_types.hpp index c30d5819..7c4b03a5 100644 --- a/src/other_tools/git_operations/git_ops_types.hpp +++ b/src/other_tools/git_operations/git_ops_types.hpp @@ -46,8 +46,8 @@ struct GitOpParams { [[nodiscard]] auto operator==(GitOpParams const& other) const noexcept -> bool { // not all fields are keys - return target_path == other.target_path && git_hash == other.git_hash && - branch == other.branch; + return target_path == other.target_path and + git_hash == other.git_hash and branch == other.branch; } }; diff --git a/src/other_tools/git_operations/git_repo_remote.cpp b/src/other_tools/git_operations/git_repo_remote.cpp index 00114b50..810df860 100644 --- a/src/other_tools/git_operations/git_repo_remote.cpp +++ b/src/other_tools/git_operations/git_repo_remote.cpp @@ -490,7 +490,7 @@ auto GitRepoRemote::UpdateCommitViaTmpRepo( err_str = *cmd_err; } std::string output{}; - if (!out_str.empty() || !err_str.empty()) { + if (not out_str.empty() or not err_str.empty()) { output = fmt::format(" with output:\n{}{}", out_str, err_str); } (*logger)(fmt::format("List remote commits command {} failed{}", @@ -644,7 +644,7 @@ auto GitRepoRemote::FetchViaTmpRepo(StorageConfig const& storage_config, err_str = *cmd_err; } std::string output{}; - if (!out_str.empty() || !err_str.empty()) { + if (not out_str.empty() or not err_str.empty()) { output = fmt::format(" with output:\n{}{}", out_str, err_str); } (*logger)(fmt::format("Fetch command {} failed{}", |