git 5.0.1 → 5.0.3

data/lib/git/parsers/diff.rb

@@ -593,11 +593,10 @@ module Git
           # @return [void]
           #
           def apply_file_mode(type, mode)
-            case type
-            when 'new'
+            if type == 'new'
               @current_file[:dst_mode] = mode
               @current_file[:src_path] = nil
-            when 'deleted'
+            else
               @current_file[:src_mode] = mode
               @current_file[:dst_path] = nil
             end

data/lib/git/parsers/grep.rb

@@ -32,7 +32,7 @@ module Git
       def parse(output)
         output.each_line.with_object(Hash.new { |h, k| h[k] = [] }) do |line, hsh|
           filename, line_num, text = line.chomp.split("\0", 3)
-          next unless text && line_num&.match?(/\A\d+\z/)
+          next unless text && line_num.match?(/\A\d+\z/)
 
           hsh[filename] << [line_num.to_i, text]
         end

data/lib/git/path_resolver.rb

@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+
+require 'git/commands/rev_parse'
+require 'git/errors'
+require 'git/execution_context'
+require 'git/execution_context/global'
+
+module Git
+  # Resolves and normalizes the filesystem paths that locate a Git repository
+  #
+  # `PathResolver` is the single home for the path-resolution logic used by the
+  # `Git::Repository` factory class methods ({Git::Repository.open} and
+  # {Git::Repository.bare}). It computes the absolute working-directory,
+  # repository (`.git`), and index paths from the caller-supplied values,
+  # following the same rules Git itself uses (including gitdir-pointer files for
+  # submodules and linked worktrees).
+  #
+  # @api private
+  #
+  module PathResolver
+    module_function
+
+    # Resolve and normalize the paths that locate a Git repository
+    #
+    # Returns a new hash containing the resolved absolute paths for:
+    #   * `:working_directory` — the working tree root (`nil` for bare repos)
+    #   * `:repository` — the `.git` directory
+    #   * `:index` — the index file
+    #
+    # This method does not mutate any inputs.
+    #
+    # @example Resolve paths for a working tree
+    #   Git::PathResolver.resolve_paths(working_directory: '/repo')
+    #   #=> { working_directory: '/repo', repository: '/repo/.git', index: '/repo/.git/index' }
+    #
+    # @param working_directory [String, nil] the working directory path
+    #
+    # @param repository [String, nil] the repository (`.git`) directory path
+    #
+    # @param index [String, nil] the index file path
+    #
+    # @param bare [Boolean] whether this is a bare repository
+    #
+    # @return [Hash{Symbol => (String, nil)}] a hash with `:working_directory`,
+    #   `:repository`, and `:index` keys
+    #
+    def resolve_paths(working_directory: nil, repository: nil, index: nil, bare: false)
+      working_dir = resolve_working_directory(working_directory, bare: bare)
+      # For bare repos, use working_directory as the default repository location
+      repo_path = resolve_repository(repository, working_dir, bare: bare, bare_default: working_directory)
+      index_path = resolve_index(index, repo_path)
+
+      {
+        working_directory: working_dir,
+        repository: repo_path,
+        index: index_path
+      }
+    end
+
+    # Find the root of the working tree that contains `working_dir`
+    #
+    # Runs `git rev-parse --show-toplevel` from `working_dir` to locate the
+    # top-level directory of the working tree.
+    #
+    # @example Find the worktree root from a subdirectory
+    #   Git::PathResolver.root_of_worktree('/repo/subdir') #=> '/repo'
+    #
+    # @param working_dir [String] a path inside the working tree
+    #
+    # @param binary_path [String, :use_global_config] path to the git binary
+    #
+    #   Controls which git binary is invoked during root detection. Defaults to
+    #   `:use_global_config`, which resolves to `Git.config.binary_path`.
+    #
+    # @param git_ssh [String, nil, :use_global_config] the SSH wrapper path
+    #
+    #   Forwarded as `GIT_SSH`. Defaults to `:use_global_config`.
+    #
+    # @return [String] the absolute path to the root of the working tree
+    #
+    # @raise [ArgumentError] if `working_dir` does not exist, is not a
+    #   directory, or is not inside a git working tree
+    #
+    #   Also raised if the git binary cannot be found.
+    #
+    def root_of_worktree(working_dir, binary_path: :use_global_config, git_ssh: :use_global_config)
+      raise ArgumentError, "'#{working_dir}' does not exist or is not a directory" unless Dir.exist?(working_dir)
+
+      execute_rev_parse_toplevel(working_dir, binary_path: binary_path, git_ssh: git_ssh)
+    end
+
+    # Run `git rev-parse --show-toplevel` from `working_dir` and return stdout
+    #
+    # @param working_dir [String] a path inside the working tree
+    #
+    # @param binary_path [String, :use_global_config] path to the git binary
+    #
+    # @param git_ssh [String, nil, :use_global_config] the SSH wrapper path
+    #
+    # @return [String] the top-level directory reported by git
+    #
+    # @raise [ArgumentError] if the git binary is not found or `working_dir` is
+    #   not inside a git working tree
+    #
+    # @api private
+    #
+    def execute_rev_parse_toplevel(working_dir, binary_path: :use_global_config, git_ssh: :use_global_config)
+      execution_context = Git::ExecutionContext::Global.new(binary_path: binary_path, git_ssh: git_ssh)
+      Git::Commands::RevParse.new(execution_context).call(
+        show_toplevel: true, chdir: File.expand_path(working_dir)
+      ).stdout
+    rescue Errno::ENOENT
+      raise ArgumentError, 'Failed to find the root of the worktree: git binary not found'
+    rescue Git::FailedError
+      raise ArgumentError, "'#{working_dir}' is not in a git working tree"
+    end
+    private_class_method :execute_rev_parse_toplevel
+
+    # Resolve the working directory path
+    #
+    # @param path [String, nil] the working directory path or `nil`
+    #
+    # @param bare [Boolean] whether this is a bare repository
+    #
+    # @return [String, nil] the absolute path, or `nil` for bare repos
+    #
+    # @api private
+    #
+    def resolve_working_directory(path, bare:)
+      return nil if bare
+
+      File.expand_path(path || Dir.pwd)
+    end
+    private_class_method :resolve_working_directory
+
+    # Resolve the repository (`.git`) directory path
+    #
+    # Handles the gitdir-pointer file case for submodules and linked worktrees.
+    #
+    # @param path [String, nil] the repository path or `nil`
+    #
+    # @param working_dir [String, nil] the working directory used for relative
+    #   path resolution
+    #
+    # @param bare [Boolean] whether this is a bare repository
+    #
+    # @param bare_default [String, nil] for bare repos, used as the default when
+    #   `path` is `nil`
+    #
+    # @return [String] the absolute path to the repository
+    #
+    # @api private
+    #
+    def resolve_repository(path, working_dir, bare:, bare_default: nil)
+      initial_path = if bare
+                       File.expand_path(path || bare_default || Dir.pwd)
+                     else
+                       File.expand_path(path || '.git', working_dir)
+                     end
+
+      resolve_gitdir_pointer(initial_path)
+    end
+    private_class_method :resolve_repository
+
+    # Resolve gitdir-pointer files used by submodules and linked worktrees
+    #
+    # If `path` points to a file containing `"gitdir: <path>"`, returns the
+    # resolved target path. Otherwise returns `path` unchanged.
+    #
+    # @param path [String] the path to check
+    #
+    # @return [String] the resolved absolute path
+    #
+    # Relative pointer targets are resolved from the directory containing the
+    # pointer file itself, matching git's pointer-file semantics.
+    #
+    # @api private
+    #
+    def resolve_gitdir_pointer(path)
+      return path unless File.file?(path)
+
+      gitdir_content = File.read(path).strip
+      return path unless gitdir_content.start_with?('gitdir: ')
+
+      gitdir_path = gitdir_content.sub(/\Agitdir: /, '')
+      File.expand_path(gitdir_path, File.dirname(path))
+    end
+    private_class_method :resolve_gitdir_pointer
+
+    # Resolve the index file path
+    #
+    # @param path [String, nil] the index path or `nil`
+    #
+    # @param repository [String] the repository directory used for relative
+    #   path resolution
+    #
+    # @return [String] the absolute path to the index file
+    #
+    # @api private
+    #
+    def resolve_index(path, repository)
+      File.expand_path(path || 'index', repository)
+    end
+    private_class_method :resolve_index
+  end
+end

data/lib/git/repository.rb

@@ -9,7 +9,6 @@ require 'git/repository/branching'
 require 'git/repository/context_helpers'
 require 'git/repository/committing'
 require 'git/repository/diffing'
-require 'git/repository/factories'
 require 'git/repository/inspecting'
 require 'git/repository/logging'
 require 'git/repository/maintenance'

data/lib/git/version.rb

@@ -4,7 +4,7 @@ module Git
   # The current gem version
   #
   # @return [String] the current gem version
-  VERSION = '5.0.1'
+  VERSION = '5.0.3'
 
   # Represents a git version with major, minor, and patch components
   #

data/lib/git.rb

@@ -55,6 +55,7 @@ require 'git/config'
 require 'git/config_entry_info'
 require 'git/parsers/config_entry'
 require 'git/configuring'
+require 'git/factories'
 require 'git/diff'
 require 'git/diff_file_numstat_info'
 require 'git/diff_file_patch_info'
@@ -99,7 +100,7 @@ require 'git/worktrees'
 #
 module Git
   extend Git::Configuring
-  extend Git::Repository::Factories
+  extend Git::Factories
 
   # Minimum git version required by this gem
   #

data/tasks/rspec.rake

@@ -1,48 +1,111 @@
 # frozen_string_literal: true
 
-require 'rspec/core/rake_task'
+# Skip parallel test execution when the PARALLEL_TESTS environment variable is set to a falsy value
+def parallel_tests_disabled_via_env?
+  parallel_tests_env = ENV.fetch('PARALLEL_TESTS', 'true').strip.downcase
+  %w[false 0 no off].include?(parallel_tests_env)
+end
+
+# Use parallel test execution for MRI where it cuts build times by 30-48%.
+# JRuby and TruffleRuby are slower with parallel_tests because each worker
+# process pays JVM/Truffle startup and warm-up overhead independently,
+# resulting in 18-28% slower builds vs. serial execution.
+def parallel_tests?
+  RUBY_ENGINE == 'ruby' && !parallel_tests_disabled_via_env?
+end
 
-# Run all specs
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+# SPEC lets a developer target one or more specific files, e.g.
+# `SPEC=spec/unit/git/version_spec.rb rake spec:unit`, running just those files
+# instead of the whole directory. Both rspec and parallel_rspec recurse a bare
+# directory argument using their own default *_spec.rb pattern, so no explicit
+# --pattern flag is needed for the non-SPEC case.
+#
+# Matches are filtered to dir so that each task only ever runs the specs it owns,
+# no matter how broad SPEC is. This keeps every task self-consistent (a unit spec
+# can never be run by spec:integration under integration's runner and env) and lets
+# a single cross-layer glob drive `rake spec`, e.g.
+# `SPEC=spec/**/git/commands/add_spec.rb rake spec` runs the unit file under
+# spec:unit and the integration file under spec:integration. A SPEC that matches
+# files elsewhere in spec/ but none under dir yields no targets, and the caller
+# skips the task rather than falling back to running all of dir.
+def spec_targets(dir)
+  spec_files = ENV.fetch('SPEC', nil)&.strip
+  return [dir] if spec_files.nil? || spec_files.empty?
+
+  targets = FileList[spec_files].sort
+  raise "SPEC=#{spec_files.inspect} did not match any files" if targets.empty?
+
+  targets.select { |target| target.delete_prefix('./').start_with?(dir) }
 end
 
-# Run only unit specs (mocked, fast)
-RSpec::Core::RakeTask.new('spec:unit') do |t|
-  t.pattern = 'spec/unit/**/*_spec.rb'
-  # On JRuby, use 'documentation' formatter so each test name is printed before
-  # it runs. When the suite hangs, the last printed line identifies the blocking
-  # test. Mirrors the same diagnostic added to spec:integration in PR #1274.
-  t.rspec_opts = '--format documentation' if RUBY_ENGINE == 'jruby'
+# True when targets name exactly one spec file (as opposed to a directory, or
+# several files).
+def single_spec_file?(targets)
+  targets.one? && File.file?(targets.first)
 end
 
-# Run only integration specs (real git, slower)
-RSpec::Core::RakeTask.new('spec:integration') do |t|
-  t.pattern = 'spec/integration/**/*_spec.rb'
-  # On JRuby, override the default Fuubar formatter with 'documentation' so that
-  # each test name is printed before it runs. This makes CI logs useful when the
-  # suite hangs: the last printed test is the one that caused the hang.
-  t.rspec_opts = '--format documentation' if RUBY_ENGINE == 'jruby'
+# The runner for targets: parallel_rspec only when the task runs in parallel and
+# there is more than one spec file to spread across workers.
+#
+# A single file always uses plain rspec. Worker startup is pure overhead with nothing
+# to divide, and parallel_tests sets TEST_ENV_NUMBER in every worker, which makes
+# spec_helper fall back from the documentation formatter to plain dots -- the opposite
+# of what a run narrowed to one file wants.
+def spec_runner(targets, parallel:)
+  parallel && !single_spec_file?(targets) ? 'parallel_rspec' : 'rspec'
 end
 
-# Run all specs in parallel
-desc 'Run all specs in parallel'
-task 'spec:parallel' do
-  sh 'bundle exec parallel_rspec spec/'
+# Run the SPEC-filtered targets for dir, or announce a skip when SPEC selected nothing
+# under dir. Silently doing nothing would read as a passing run of the whole directory.
+def run_spec_task(name, dir, env, parallel:)
+  targets = spec_targets(dir)
+
+  if targets.empty?
+    puts "Skipping #{name}: SPEC=#{ENV.fetch('SPEC', nil)} matched no files under #{dir}"
+  else
+    sh env, 'bundle', 'exec', spec_runner(targets, parallel: parallel), *targets
+  end
 end
 
-# Run only unit specs in parallel
-desc 'Run unit specs in parallel'
-task 'spec:unit:parallel' do
-  sh 'bundle exec parallel_rspec spec/unit/'
+def define_parallel_spec_task(name, dir, env: {})
+  task name do
+    run_spec_task(name, dir, env, parallel: true)
+  end
 end
 
-# Run only integration specs in parallel
-desc 'Run integration specs in parallel'
-task 'spec:integration:parallel' do
-  sh 'bundle exec parallel_rspec spec/integration/'
+def define_serial_spec_task(name, dir, env: {})
+  task name do
+    run_spec_task(name, dir, env, parallel: false)
+  end
 end
 
+# Define a spec task that runs in parallel (via parallel_tests) when parallel_tests? is
+# true, and serially (via a direct `bundle exec rspec` call) otherwise. env, when given,
+# is passed to `sh` and scoped to just the spawned test subprocess(es).
+def define_spec_task(name, dir, desc_text, env: {})
+  desc desc_text
+  parallel_tests? ? define_parallel_spec_task(name, dir, env: env) : define_serial_spec_task(name, dir, env: env)
+end
+
+# Run only unit specs. These run in a few seconds, so parallel_tests startup
+# overhead isn't worth it - always run serially.
+desc 'Run unit RSpec tests (mocked, fast; SPEC=<glob> to run specific files)'
+define_serial_spec_task('spec:unit', 'spec/unit/')
+
+# Run only integration specs. Coverage is forced off (regardless of the COVERAGE
+# env var): integration tests intentionally aren't exhaustive, so tracking or
+# reporting coverage for them would misleadingly suggest that low integration
+# coverage is a problem to fix.
+define_spec_task(
+  'spec:integration', 'spec/integration/',
+  'Run integration RSpec tests (real git, slower; SPEC=<glob> to run specific files)',
+  env: { 'COVERAGE' => 'false' }
+)
+
+# Run all specs, keeping unit and integration output clearly separated
+desc 'Run unit and integration RSpec tests (SPEC=<glob> to run specific files)'
+task spec: %w[spec:unit spec:integration]
+
 CLEAN << 'coverage'
 CLEAN << '.rspec_status'
 CLEAN << 'rspec-report.xml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - Scott Chacon and others
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -197,14 +197,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/commands/address-copilot-reviews.md"
+- ".claude/settings.json"
+- ".claude/skills"
 - ".commitlintrc.yml"
 - ".dockerignore"
 - ".github/copilot-instructions.md"
@@ -356,6 +359,7 @@ files:
 - ".yardopts"
 - AI_POLICY.md
 - CHANGELOG.md
+- CLAUDE.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - GOVERNANCE.md
@@ -547,6 +551,7 @@ files:
 - lib/git/execution_context.rb
 - lib/git/execution_context/global.rb
 - lib/git/execution_context/repository.rb
+- lib/git/factories.rb
 - lib/git/file_ref.rb
 - lib/git/fsck_object.rb
 - lib/git/fsck_result.rb
@@ -563,6 +568,7 @@ files:
 - lib/git/parsers/remote.rb
 - lib/git/parsers/stash.rb
 - lib/git/parsers/tag.rb
+- lib/git/path_resolver.rb
 - lib/git/remote.rb
 - lib/git/remote_info.rb
 - lib/git/repository.rb
@@ -570,13 +576,11 @@ files:
 - lib/git/repository/committing.rb
 - lib/git/repository/context_helpers.rb
 - lib/git/repository/diffing.rb
-- lib/git/repository/factories.rb
 - lib/git/repository/inspecting.rb
 - lib/git/repository/logging.rb
 - lib/git/repository/maintenance.rb
 - lib/git/repository/merging.rb
 - lib/git/repository/object_operations.rb
-- lib/git/repository/path_resolver.rb
 - lib/git/repository/remote_operations.rb
 - lib/git/repository/shared_private.rb
 - lib/git/repository/staging.rb
@@ -626,8 +630,8 @@ licenses:
 metadata:
   homepage_uri: http://github.com/ruby-git/ruby-git
   source_code_uri: http://github.com/ruby-git/ruby-git
-  changelog_uri: https://rubydoc.info/gems/git/5.0.1/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/5.0.1
+  changelog_uri: https://rubydoc.info/gems/git/5.0.3/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/5.0.3
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: