woods 1.6.0 → 2.0.0.beta1

data/lib/woods/git_command.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Woods
+  # The one place a Woods git command line is built.
+  #
+  # Every git call Woods makes is rooted at the extracted application rather
+  # than at the process working directory, so extraction launched from another
+  # checkout never reports that checkout's history.
+  #
+  # `WOODS_GIT_DIR` wins when set. It is the escape hatch for a container over
+  # a linked worktree: `.git` there is a file naming an absolute host path that
+  # may not be mounted, and git's own `GIT_DIR` is not enough, because a
+  # worktree's private git directory reaches the shared object store through a
+  # relative `commondir` pointer that resolves outside the mount, which
+  # `GIT_COMMON_DIR` does not override (B-181, B-186).
+  #
+  # Three call sites use this, and the documentation promises all three:
+  # per-unit enrichment (`Extractor`), manifest provenance (`GitProvenance`),
+  # and the `woods:incremental` diff range (`lib/tasks/woods.rake`).
+  module GitCommand
+    # Environment variable naming the canonical git directory.
+    OVERRIDE_KEY = 'WOODS_GIT_DIR'
+
+    module_function
+
+    # @param root [String, Pathname] repository root the command runs against
+    # @param args [Array<String>] git arguments, global options included
+    # @param env [Hash] environment source (overridable in specs)
+    # @return [Array<String>] full argv for `Open3`
+    def argv(root, *args, env: ENV)
+      root = root.to_s
+      override = env[OVERRIDE_KEY]
+      return ['git', '-C', root, *args] if override.nil? || override.empty?
+
+      ['git', '--git-dir', override, '--work-tree', root, '-C', root, *args]
+    end
+  end
+end

data/lib/woods/git_provenance.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
+require_relative 'git_command'
 
 module Woods
   # Resolves git provenance (branch + commit SHA) for the extracted codebase,
@@ -78,12 +79,25 @@ module Woods
     #
     # @return [String] stripped output, or empty string on any failure
     def rev_parse(*args)
-      out, status = Open3.capture2('git', '-C', @root, 'rev-parse', *args)
+      out, _err, status = Open3.capture3(*git_argv('rev-parse', *args))
       status.success? ? out.strip : ''
     rescue StandardError
       ''
     end
 
+    # +WOODS_GIT_DIR+ names the canonical git directory outright and wins when
+    # set. It is the escape hatch for a container that can mount that
+    # directory but not the host path a linked worktree's +.git+ file points
+    # at; git's own +GIT_DIR+ is not enough there, because a worktree's
+    # private git directory reaches the shared one through a relative
+    # +commondir+ pointer that resolves outside the mount.
+    #
+    # @param args [Array<String>] git arguments
+    # @return [Array<String>] full argv
+    def git_argv(*args)
+      GitCommand.argv(@root, *args, env: @env)
+    end
+
     # Decide what to emit when git resolution produced nothing. A baked +GIT_*+
     # env var is honored only when this checkout is not a git working tree (no
     # +.git+ at the root) or git is unavailable. When git is present AND a +.git+
@@ -103,7 +117,7 @@ module Woods
       return @git_available if defined?(@git_available)
 
       @git_available = begin
-        _out, status = Open3.capture2('git', '--version')
+        _out, _err, status = Open3.capture3('git', '--version')
         status.success?
       rescue StandardError
         false