git 4.3.2 → 5.0.0.beta.2

data/README.md

@@ -30,6 +30,8 @@ Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?log
   - [Ruby Version Support Policy](#ruby-version-support-policy)
   - [Git Version Support Policy](#git-version-support-policy)
 - [📢 Project Announcements 📢](#-project-announcements-)
+  - [2026-06-25: v5.0.0.beta.2 Released](#2026-06-25-v500beta2-released)
+  - [2026-06-04: v5.0.0.beta.1 Released](#2026-06-04-v500beta1-released)
   - [2026-01-07: AI Policy Introduced](#2026-01-07-ai-policy-introduced)
   - [2025-07-09: Architectural Redesign](#2025-07-09-architectural-redesign)
   - [2025-07-07: We Now Use RuboCop](#2025-07-07-we-now-use-rubocop)
@@ -51,7 +53,7 @@ Get started by obtaining a repository object by:
   [Git.clone](https://rubydoc.info/gems/git/Git#clone-class_method)
 
 Methods that can be called on a repository object are documented in
-[Git::Base](https://rubydoc.info/gems/git/Git/Base)
+[Git::Repository](https://rubydoc.info/gems/git/Git/Repository)
 
 ## Install
 
@@ -86,8 +88,8 @@ All functionality for this gem starts with the top-level
 non-repo scoped `git` commands such as `config`.
 
 The `Git` module also has factory methods such as `open`, `clone`, and `init` which
-return a [`Git::Base`](https://rubydoc.info/gems/git/Git/Base) object. The
-`Git::Base` object is used to run repo-specific `git` commands such as `add`,
+return a [`Git::Repository`](https://rubydoc.info/gems/git/Git/Repository) object. The
+`Git::Repository` object is used to run repo-specific `git` commands such as `add`,
 `commit`, `push`, and `log`.
 
 Clone, read status, and log:
@@ -190,11 +192,11 @@ Here are the operations that need read permission only:
 ```ruby
 repo = Git.open(working_dir, :log => Logger.new(STDOUT))
 
-repo.index
-repo.index.readable?
-repo.index.writable?
-repo.repo
-repo.dir
+repo.index            # Pathname to the index file
+repo.index.readable?  # check if index is readable
+repo.index.writable?  # check if index is writable
+repo.repo             # Pathname to the .git directory
+repo.dir              # Pathname to the working directory
 
 # ls-tree with recursion into subtrees (list files)
 repo.ls_tree("HEAD", recursive: true)
@@ -415,8 +417,8 @@ repo.merge([branch1, branch2])
 
 repo.merge_base('branch1', 'branch2')
 
-r = repo.add_remote(name, uri)  # Git::Remote
-r = repo.add_remote(name, Git::Base)  # Git::Remote
+r = repo.remote_add(name, uri)  # Git::Remote
+r = repo.remote_add(name, other_repo)  # Git::Remote (other_repo is a Git::Repository instance)
 
 repo.remotes  # array of Git::Remotes
 repo.remote(name).fetch
@@ -436,12 +438,12 @@ repo.fetch('origin', {:'update-head-ok' => true})
 repo.pull
 repo.pull(Git::Repo, Git::Branch) # fetch and a merge
 
-repo.add_tag('tag_name') # returns Git::Tag
-repo.add_tag('tag_name', 'object_reference')
-repo.add_tag('tag_name', 'object_reference', {:options => 'here'})
-repo.add_tag('tag_name', {:options => 'here'})
+repo.tag_add('tag_name') # returns Git::Object::Tag
+repo.tag_add('tag_name', 'object_reference')
+repo.tag_add('tag_name', 'object_reference', {:options => 'here'})
+repo.tag_add('tag_name', {:options => 'here'})
 
-repo.delete_tag('tag_name')
+repo.tag_delete('tag_name')
 
 repo.repack
 
@@ -649,6 +651,56 @@ notes.
 
 ## 📢 Project Announcements 📢
 
+### 2026-06-25: v5.0.0.beta.2 Released
+
+The architectural redesign is approximately **90% complete** and we have published
+[`git v5.0.0.beta.2`](https://rubygems.org/gems/git/versions/5.0.0.beta.2) as our
+second pre-release.
+
+**To try the beta**, add the pre-release version to your `Gemfile`:
+
+```ruby
+gem 'git', '~> 5.0.0.beta'
+```
+
+Or install it directly:
+
+```sh
+gem install git --pre
+```
+
+The intent is full backward compatibility with v4.x, but given the size and scope of
+the redesign, some incompatibilities may exist. Please give the latest beta a try and
+[open an issue](https://github.com/ruby-git/ruby-git/issues) if you hit anything
+unexpected — your feedback helps us ship a solid v5.0.0.
+
+See [UPGRADING.md](UPGRADING.md) for a full list of deprecations and breaking changes.
+
+### 2026-06-04: v5.0.0.beta.1 Released
+
+The architectural redesign is approximately **65% complete** and we have published
+[`git v5.0.0.beta.1`](https://rubygems.org/gems/git/versions/5.0.0.beta.1) as our
+first pre-release.
+
+**To try the beta**, add the pre-release version to your `Gemfile`:
+
+```ruby
+gem 'git', '~> 5.0.0.beta'
+```
+
+Or install it directly:
+
+```sh
+gem install git --pre
+```
+
+The intent is full backward compatibility with 4.x, but given the size and scope of
+the redesign, some incompatibilities may exist. Please give the latest beta a try and
+[open an issue](https://github.com/ruby-git/ruby-git/issues) if you hit anything
+unexpected — your feedback helps us ship a solid 5.0.0.
+
+See [UPGRADING.md](UPGRADING.md) for a full list of deprecations and breaking changes.
+
 ### 2026-01-07: AI Policy Introduced
 
 We have adopted a formal [AI Policy](AI_POLICY.md) to clarify expectations for

data/Rakefile

@@ -5,14 +5,66 @@ require 'rake/clean'
 # Load all .rake files from tasks and its subdirectories.
 Dir.glob('tasks/**/*.rake').each { |r| load r }
 
-default_tasks = []
-default_tasks << :test if Rake::Task.task_defined?(:test)
-default_tasks << :rubocop if Rake::Task.task_defined?(:rubocop)
+desc 'Run all tests (TestUnit and RSpec)'
+task 'test-all': %i[test spec]
+
+desc 'Run all tests in parallel (TestUnit and RSpec run concurrently)'
+task 'test-all:parallel' do
+  errors = []
+  mutex = Mutex.new
+  threads = %w[test:parallel spec:parallel].map do |t|
+    Thread.new do
+      Rake::Task[t].invoke
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      mutex.synchronize { errors << e }
+    end
+  end
+  threads.each(&:join)
+  raise errors.first if errors.any?
+end
+
+default_tasks = %i[test spec:unit spec:integration rubocop]
 default_tasks << :yard if Rake::Task.task_defined?(:yard)
-default_tasks << :'yardstick:coverage' if Rake::Task.task_defined?(:'yardstick:coverage')
-# Do not include yardstick as a default task for now since there are too many
-# warnings. Will work to get the warnings down before re-enabling it.
-# default_tasks << :yardstick if Rake::Task.task_defined?(:yardstick)
-default_tasks << :build if Rake::Task.task_defined?(:build)
+default_tasks << :build
+
+default_tasks_parallel = %w[test:parallel spec:unit:parallel spec:integration:parallel rubocop]
+default_tasks_parallel << :yard if Rake::Task.task_defined?(:yard)
+default_tasks_parallel << :build
+
+# 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.
+parallel_supported = RUBY_ENGINE == 'ruby'
+task default: parallel_supported ? default_tasks_parallel : default_tasks
+
+desc 'Same as default but runs tests in parallel'
+task 'default:parallel': default_tasks_parallel
+
+module Rake
+  # Overload Rake::Task to add logging
+  class Task
+    # Store the original execute method
+    alias original_execute execute
+
+    # Override execute to add a print statement
+    def execute(args = nil)
+      # Only output the task name if it wasn't the only top-level task
+      # rake default      # => output task name for each task called by the default task
+      # rake rubocop      # => do not output the task name
+      # rake rubocop yard # => output task name for rubocop and yard
+      top_level_tasks = Rake.application.top_level_tasks
+      box("Rake task: #{name}") unless top_level_tasks.length == 1 && name == top_level_tasks[0]
+      original_execute(args)
+    end
+
+    private
 
-task default: default_tasks
+    def box(message)
+      width = message.length + 2
+      puts "┌#{'─' * width}┐"
+      puts "│ #{message} │"
+      puts "└#{'─' * width}┘"
+    end
+  end
+end

data/UPGRADING.md

@@ -0,0 +1,141 @@
+# Upgrading the `git` Gem
+
+> **⚠️ Work in progress — v5.0.0 is currently in beta.**
+> This document is updated incrementally as development continues and is not yet
+> complete. If you encounter a compatibility problem not covered here, please
+> [open an issue](https://github.com/ruby-git/ruby-git/issues).
+
+- [Upgrading from v4.x to v5.x](#upgrading-from-v4x-to-v5x)
+  - [Overview](#overview)
+  - [`Git::Lib` removal](#gitlib-removal)
+    - [Methods with a direct replacement](#methods-with-a-direct-replacement)
+    - [Methods with no replacement](#methods-with-no-replacement)
+    - [Internal plumbing methods (no replacement)](#internal-plumbing-methods-no-replacement)
+  - [Deprecated methods](#deprecated-methods)
+
+## Upgrading from v4.x to v5.x
+
+### Overview
+
+The primary goal of v5.0.0 is to move everyone onto a new internal architecture
+while keeping the existing v4.x API working. The vast majority of v4.x code
+requires no changes to run on v5.x.
+
+The new architecture delivered in v5.0.0 is the foundation for future API
+improvements across upcoming major releases.
+
+The new architecture introduces a layered design (`Git::Commands`, `Git::Repository`,
+and associated parsers). Compatibility shims — deprecated forwarding methods that map
+old call patterns to the new API — ensure that v4.x code continues to work. These
+shims emit deprecation warnings that tell you exactly what to change and what will be
+eliminated in a future major release (most likely v6.0.0).
+
+Hard breaks are limited to a small number of methods that had no safe
+migration path — these are described in detail below.
+
+Our intent is to make upgrading to v5.x as smooth as possible. For information
+on how to suppress or configure deprecation warnings, see the
+[Deprecations](README.md#deprecations) section of the README.
+
+---
+
+### `Git::Lib` removal
+
+The object returned by `Git.open`, `Git.clone`, and `Git.init` — the object
+you call methods on to interact with your repository — inadvertently exposed
+a `#lib` method that gave access to `Git::Lib`, the gem's internal
+implementation class. This was never intended to be public; it was an
+implementation detail that leaked out. `Git::Lib` is removed in v5.0.0.
+
+Calling `#lib` on the repository object returns `self` with a deprecation
+warning so that existing `g.lib.*` call chains continue to work during
+migration. The `#lib` method itself is removed in v6.0.0. Calls to methods
+that have no replacement (see below) raise `NoMethodError` with an
+informative message.
+
+Most public behavior previously accessible via `g.lib.*` is available
+directly on the repository object (i.e., `g.*`). A small number of methods
+have no replacement — see below. The sections below list every affected method.
+
+#### Methods with a direct replacement
+
+All of the following `g.lib.*` calls work in v5.x but emit a deprecation
+warning. Migrate to the replacement shown to silence the `g.lib.*` deprecation
+warning; note that some replacements are themselves deprecated — see the table
+notes for the final migration target.
+
+| Deprecated call (works in v5.x, removed in v6.0.0) | Replacement |
+|---------------------------------------------------|-------------|
+| `g.lib.config_get(name)` | `g.config(name)` |
+| `g.lib.config_list` | `g.config` |
+| `g.lib.config_set(name, value)` | `g.config(name, value)` |
+| `g.lib.git_version` | `g.git_version` |
+| `g.lib.global_config_get(name)` | `g.global_config(name)` |
+| `g.lib.global_config_list` | `g.global_config` |
+| `g.lib.global_config_set(name, value)` | `g.global_config(name, value)` |
+| `g.lib.parse_config(file)` | `g.config(file: file)` |
+| `g.lib.stash_list` | `g.stash_list` *(also deprecated — use `g.stashes_all`)* |
+| `g.lib.unmerged` | `g.unmerged` |
+| `g.lib.change_head_branch(name)` | `g.change_head_branch(name)` |
+| `g.lib.branch_current` | `g.current_branch` |
+| `g.lib.ls_remote(location, opts)` | `g.ls_remote(location, opts)` |
+| `g.lib.current_branch_state` | `g.current_branch_state` |
+
+> **Note — `current_branch_state` return type change:** `g.lib.current_branch_state`
+> returned a `Git::Lib::HeadState` (a mutable `Struct`). `g.current_branch_state`
+> returns a `Git::Repository::Branching::HeadState` (an immutable `Data` object).
+> Both expose `.state` (`:active`, `:unborn`, or `:detached`) and `.name`. If your
+> code relies on the struct being mutable or uses positional construction
+> (`Git::Lib::HeadState.new(:active, 'main')`), update to keyword construction:
+> `Git::Repository::Branching::HeadState.new(state: :active, name: 'main')`.
+
+#### Methods with no replacement
+
+| v4.x call | Notes |
+|-----------|-------|
+| `g.lib.list_files(ref_dir)` | Walked `.git/refs/` directly. Use `g.branches`, `g.tags`, or `g.remotes` instead. |
+
+#### Internal plumbing methods (no replacement)
+
+The following methods were technically public on `Git::Lib` but are internal
+helpers with no plausible external use. They have no replacement in v5.0.0:
+
+- `assert_args_are_not_options`
+- `assert_valid_opts`
+- `cat_file_object_meta`
+- `command_capturing`
+- `command_streaming`
+- `each_cat_file_header`
+- `handle_deprecated_path_option`
+- `normalize_pathspecs`
+- `parse_cat_file_meta`
+- `parse_config_list`
+- `process_commit_data`
+- `validate_pathspec_types`
+
+---
+
+### Deprecated methods
+
+The following methods are available in v5.x with deprecation warnings and
+are removed in v6.0.0.
+
+| Deprecated call (works in v5.x, removed in v6.0.0) | Replacement |
+|---------------------------------------------------|-------------|
+| `g.config_get(name)` | `g.config(name)` |
+| `g.config_list` | `g.config` |
+| `g.config_set(name, value)` | `g.config(name, value)` |
+| `g.global_config_get(name)` | `g.global_config(name)` |
+| `g.global_config_list` | `g.global_config` |
+| `g.global_config_set(name, value)` | `g.global_config(name, value)` |
+| `g.parse_config(file)` | `g.config(file: file)` |
+| `g.stash_list` | `g.stashes_all` |
+| `g.add_remote(name, url, opts)` | `g.remote_add(name, url, opts)` |
+| `g.remove_remote(name)` | `g.remote_remove(name)` |
+| `g.set_remote_url(name, url)` | `g.remote_set_url(name, url)` |
+| `g.add_tag(name, ...)` | `g.tag_add(name, ...)` |
+| `g.delete_tag(name)` | `g.tag_delete(name)` |
+| `include Git; config(...)` | `Git.open(Dir.pwd).config(...)` |
+| `include Git; global_config(...)` | `Git.global_config(...)` |
+
+---

data/commitlint.test

@@ -0,0 +1,4 @@
+test: update the tests
+
+Wow I really want to edit the PR #1024 but I can't.
+

data/git.gemspec

@@ -35,18 +35,29 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rchardet', '~> 1.9'
 
   spec.add_development_dependency 'create_github_release', '~> 2.1'
+  spec.add_development_dependency 'fuubar', '~> 2.5'
   spec.add_development_dependency 'main_branch_shared_rubocop_config', '~> 0.1'
-  spec.add_development_dependency 'minitar', '~> 1.0'
-  spec.add_development_dependency 'mocha', '~> 2.7'
-  spec.add_development_dependency 'rake', '~> 13.2'
-  spec.add_development_dependency 'rubocop', '~> 1.77'
+  spec.add_development_dependency 'minitar', '~> 1.1'
+  spec.add_development_dependency 'mocha', '~> 2.8'
+  spec.add_development_dependency 'parallel_tests', '~> 5.6'
+  spec.add_development_dependency 'rake', '~> 13.3'
+  spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'rubocop', '~> 1.82'
+  spec.add_development_dependency 'simplecov', '~> 0.22'
+  spec.add_development_dependency 'simplecov-lcov', '~> 0.9'
+  spec.add_development_dependency 'simplecov-rspec', '~> 0.4'
+  spec.add_development_dependency 'test-unit', '~> 3.7'
 
-  spec.add_development_dependency 'test-unit', '~> 3.6'
+  if RUBY_ENGINE == 'truffleruby' && Gem::Version.new(RUBY_ENGINE_VERSION) < Gem::Version.new('34.0.0')
+    # i18n 1.15+ uses Fiber.[] (Ruby 3.2 Fiber storage) which TruffleRuby < 34.0.0 does not implement
+    spec.add_development_dependency 'i18n', '< 1.15'
+  end
 
-  unless RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'irb', '~> 1.6'
+  unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
+    spec.add_development_dependency 'irb', '~> 1.16'
     spec.add_development_dependency 'redcarpet', '~> 3.6'
     spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.28'
+    spec.add_development_dependency 'yard_example_test', '~> 0.2', '>= 0.2.1'
     spec.add_development_dependency 'yardstick', '~> 0.9'
   end
 

data/lib/git/args_builder.rb

@@ -12,14 +12,6 @@ module Git
     ARG_BUILDERS = {
       boolean: ->(config, value) { value ? config[:flag] : [] },
 
-      boolean_negatable: lambda do |config, value|
-        case value
-        when true then config[:flag]
-        when false then config[:flag].sub('--', '--no-')
-        else []
-        end
-      end,
-
       valued_equals: ->(config, value) { "#{config[:flag]}=#{value}" if value },
 
       valued_space: ->(config, value) { [config[:flag], value.to_s] if value },