Move path manipulation out of the Workspace::Git class

common/lib/dependabot/shared_helpers.rb

@@ -26,6 +26,9 @@ module SharedHelpers
 
     def self.in_a_temporary_repo_directory(directory = "/", repo_contents_path = nil, &block)
       if repo_contents_path
+        # If a workspace has been defined to allow orcestration of the git repo
+        # by the runtime we should defer to it, otherwise we prepare the folder
+        # for direct use and yield.
         if Dependabot::Workspace.active_workspace
           Dependabot::Workspace.active_workspace.change(&block)
         else

common/lib/dependabot/workspace.rb

@@ -13,10 +13,12 @@ class << self
     def self.setup(repo_contents_path:, directory:)
       Dependabot.logger.debug("Setting up workspace in #{repo_contents_path}")
 
-      @active_workspace = Dependabot::Workspace::Git.new(
-        repo_contents_path,
-        Pathname.new(directory || "/").cleanpath
-      )
+      full_path = Pathname.new(File.join(repo_contents_path, directory)).expand_path
+      # Handle missing directories by creating an empty one and relying on the
+      # file fetcher to raise a DependencyFileNotFound error
+      FileUtils.mkdir_p(full_path)
+
+      @active_workspace = Dependabot::Workspace::Git.new(full_path)
     end
 
     def self.store_change(memo:)

common/lib/dependabot/workspace/git.rb

@@ -11,16 +11,10 @@ class Git < Base
 
       attr_reader :initial_head_sha
 
-      def initialize(repo_contents_path, directory = "/")
-        full_path = Pathname.new(File.join(repo_contents_path, directory)).expand_path
-        # Handle missing directories by creating an empty one and relying on the
-        # file fetcher to raise a DependencyFileNotFound error
-        FileUtils.mkdir_p(full_path)
-        super(full_path)
+      def initialize(path)
+        super(path)
         @initial_head_sha = head_sha
-
-        run_shell_command(%(git config user.name "#{USER}"), allow_unsafe_shell_command: true)
-        run_shell_command(%(git config user.email "#{EMAIL}"), allow_unsafe_shell_command: true)
+        configure_git
       end
 
       def to_patch
@@ -57,6 +51,11 @@ def capture_failed_change_attempt(memo = nil, error = nil)
 
       private
 
+      def configure_git
+        run_shell_command(%(git config user.name "#{USER}"), allow_unsafe_shell_command: true)
+        run_shell_command(%(git config user.email "#{EMAIL}"), allow_unsafe_shell_command: true)
+      end
+
       def head_sha
         run_shell_command("git rev-parse HEAD").strip
       end