5 files changed, 27 insertions, 11 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 3c580d4d..4a9c60e1 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -32,7 +32,8 @@
   , "hdrs": ["create_execution_api.hpp"]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   , "deps":
-    [ ["src/buildtool/common/remote", "remote_common"]
+    [ ["src/buildtool/common", "config"]
+    , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/execution_api/local", "local"]
     , ["src/buildtool/execution_api/remote", "bazel"]
     ]
diff --git a/src/buildtool/execution_api/common/create_execution_api.hpp b/src/buildtool/execution_api/common/create_execution_api.hpp
index 02fcee4b..c62d0f17 100644
--- a/src/buildtool/execution_api/common/create_execution_api.hpp
+++ b/src/buildtool/execution_api/common/create_execution_api.hpp
@@ -20,15 +20,19 @@
 
 #include "gsl/gsl"
 #include "src/buildtool/common/remote/remote_common.hpp"
+#include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/execution_api/local/local_api.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
 
 /// \brief Utility function to instantiate either a Local or Bazel Execution
 /// API.
 /// \param address if provided, a BazelApi is instantiated
+/// \param repo_config repository configuration to be used by GitApi calls
 /// \param instance_name only used in the construction of the BazelApi object
 [[nodiscard]] static inline auto CreateExecutionApi(
     std::optional<ServerAddress> const& address,
+    std::optional<gsl::not_null<RepositoryConfig*>> const& repo_config =
+        std::nullopt,
     std::string const& instance_name = "remote-execution")
     -> gsl::not_null<IExecutionApi::Ptr> {
     if (address) {
@@ -38,7 +42,7 @@
         return std::make_unique<BazelApi>(
             instance_name, address->host, address->port, config);
     }
-    return std::make_unique<LocalApi>();
+    return std::make_unique<LocalApi>(repo_config);
 }
 
 #endif
diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp
index 7542c296..52c21627 100644
--- a/src/buildtool/execution_api/git/git_api.hpp
+++ b/src/buildtool/execution_api/git/git_api.hpp
@@ -26,7 +26,7 @@
 /// \brief API for local execution.
 class GitApi final : public IExecutionApi {
   public:
-    GitApi() : repo_config_{&RepositoryConfig::Instance()} {}
+    GitApi() = delete;
     explicit GitApi(gsl::not_null<RepositoryConfig*> const& repo_config)
         : repo_config_{repo_config} {}
     auto CreateAction(
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index f2c0e1b4..c8895c20 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -26,6 +26,7 @@
   , "deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/common", "config"]
     , ["src/buildtool/storage", "storage"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp
index c04e82f4..f919e9c9 100644
--- a/src/buildtool/execution_api/local/local_api.hpp
+++ b/src/buildtool/execution_api/local/local_api.hpp
@@ -24,6 +24,7 @@
 
 #include "fmt/core.h"
 #include "gsl/gsl"
+#include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/compatibility/compatibility.hpp"
 #include "src/buildtool/compatibility/native_support.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp"
@@ -38,6 +39,10 @@
 /// \brief API for local execution.
 class LocalApi final : public IExecutionApi {
   public:
+    explicit LocalApi(std::optional<gsl::not_null<RepositoryConfig*>>
+                          repo_config = std::nullopt)
+        : repo_config_{std::move(repo_config)} {}
+
     auto CreateAction(
         ArtifactDigest const& root_digest,
         std::vector<std::string> const& command,
@@ -74,12 +79,13 @@ class LocalApi final : public IExecutionApi {
                     info.digest, output_paths[i]);
                 if (not infos) {
                     if (Compatibility::IsCompatible()) {
-                        // infos not availablble, and in compatible mode cannot
+                        // infos not available, and in compatible mode cannot
                         // fall back to git
                         return false;
                     }
-                    if (not GitApi().RetrieveToPaths({info},
-                                                     {output_paths[i]})) {
+                    if (repo_config_ and
+                        not GitApi(repo_config_.value())
+                                .RetrieveToPaths({info}, {output_paths[i]})) {
                         return false;
                     }
                 }
@@ -92,12 +98,13 @@ class LocalApi final : public IExecutionApi {
                     info.digest, IsExecutableObject(info.type));
                 if (not blob_path) {
                     if (Compatibility::IsCompatible()) {
-                        // infos not availablble, and in compatible mode cannot
+                        // infos not available, and in compatible mode cannot
                         // fall back to git
                         return false;
                     }
-                    if (not GitApi().RetrieveToPaths({info},
-                                                     {output_paths[i]})) {
+                    if (repo_config_ and
+                        not GitApi(repo_config_.value())
+                                .RetrieveToPaths({info}, {output_paths[i]})) {
                         return false;
                     }
                 }
@@ -140,11 +147,13 @@ class LocalApi final : public IExecutionApi {
                         info.ToString(),
                         fd);
                     if (Compatibility::IsCompatible()) {
-                        // infos not availablble, and in compatible mode cannot
+                        // infos not available, and in compatible mode cannot
                         // fall back to git
                         return false;
                     }
-                    if (not GitApi().RetrieveToFds({info}, {fd}, raw_tree)) {
+                    if (repo_config_ and
+                        not GitApi(repo_config_.value())
+                                .RetrieveToFds({info}, {fd}, raw_tree)) {
                         return false;
                     }
                 }
@@ -413,6 +422,7 @@ class LocalApi final : public IExecutionApi {
     }
 
   private:
+    std::optional<gsl::not_null<RepositoryConfig*>> repo_config_{};
     gsl::not_null<Storage const*> storage_ = &Storage::Instance();
 };