git 5.1.0 → 5.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (101) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +45 -0
  3. data/CONTRIBUTING.md +185 -165
  4. data/LICENSE +1 -1
  5. data/README.md +151 -151
  6. data/git.gemspec +35 -3
  7. data/lib/git/command_line/base.rb +1 -2
  8. data/lib/git/commands/base.rb +1 -1
  9. data/lib/git/commands/cat_file/raw.rb +8 -7
  10. data/lib/git/repository/branching.rb +79 -5
  11. data/lib/git/version.rb +1 -1
  12. metadata +5 -94
  13. data/.claude/commands/address-copilot-reviews.md +0 -14
  14. data/.claude/settings.json +0 -16
  15. data/.claude/skills +0 -1
  16. data/.commitlintrc.yml +0 -38
  17. data/.dockerignore +0 -27
  18. data/.github/copilot-instructions.md +0 -30
  19. data/.github/hooks/bin-setup-on-worktree.json +0 -11
  20. data/.github/hooks/run-bin-setup-once.sh +0 -20
  21. data/.github/issue_template.md +0 -15
  22. data/.github/prompts/iteratively-address-copilot-reviews.prompt.md +0 -188
  23. data/.github/pull_request_template.md +0 -21
  24. data/.github/skills/breaking-change-analysis/SKILL.md +0 -99
  25. data/.github/skills/ci-cd-troubleshooting/SKILL.md +0 -264
  26. data/.github/skills/command-implementation/REFERENCE.md +0 -994
  27. data/.github/skills/command-implementation/SKILL.md +0 -230
  28. data/.github/skills/command-test-conventions/SKILL.md +0 -664
  29. data/.github/skills/command-yard-documentation/SKILL.md +0 -434
  30. data/.github/skills/dependency-management/SKILL.md +0 -72
  31. data/.github/skills/development-workflow/SKILL.md +0 -512
  32. data/.github/skills/facade-implementation/REFERENCE.md +0 -837
  33. data/.github/skills/facade-implementation/SKILL.md +0 -269
  34. data/.github/skills/facade-test-conventions/SKILL.md +0 -391
  35. data/.github/skills/facade-yard-documentation/SKILL.md +0 -435
  36. data/.github/skills/make-skill-template/SKILL.md +0 -226
  37. data/.github/skills/pr-readiness-review/SKILL.md +0 -205
  38. data/.github/skills/project-context/SKILL.md +0 -306
  39. data/.github/skills/pull-request-review/SKILL.md +0 -168
  40. data/.github/skills/rebase/SKILL.md +0 -148
  41. data/.github/skills/refactor-command-to-commandlineresult/SKILL.md +0 -131
  42. data/.github/skills/release-management/SKILL.md +0 -125
  43. data/.github/skills/resolve-feedback/SKILL.md +0 -288
  44. data/.github/skills/review-arguments-dsl/CHECKLIST.md +0 -788
  45. data/.github/skills/review-arguments-dsl/SKILL.md +0 -214
  46. data/.github/skills/review-cross-command-consistency/SKILL.md +0 -139
  47. data/.github/skills/reviewing-skills/SKILL.md +0 -214
  48. data/.github/skills/rspec-unit-testing-standards/SKILL.md +0 -685
  49. data/.github/skills/tdd-refactor-step/SKILL.md +0 -236
  50. data/.github/skills/test-debugging/SKILL.md +0 -161
  51. data/.github/skills/yard-documentation/SKILL.md +0 -981
  52. data/.github/skills/yard-documentation/element-rules.md +0 -162
  53. data/.github/skills-deprecated/README.md +0 -21
  54. data/.github/skills-deprecated/extract-command-from-lib/SKILL.md +0 -487
  55. data/.github/skills-deprecated/extract-facade-from-base-lib/KEYWORD_ARG_REMEDIATION.md +0 -22
  56. data/.github/skills-deprecated/extract-facade-from-base-lib/SKILL.md +0 -600
  57. data/.github/skills-deprecated/review-backward-compatibility/SKILL.md +0 -275
  58. data/.github/workflows/continuous_integration.yml +0 -358
  59. data/.github/workflows/enforce_conventional_commits.yml +0 -35
  60. data/.github/workflows/experimental_continuous_integration.yml +0 -59
  61. data/.github/workflows/release.yml +0 -52
  62. data/.github/workflows/warm_bundler_caches.yml +0 -82
  63. data/.gitignore +0 -30
  64. data/.husky/commit-msg +0 -1
  65. data/.husky/pre-commit +0 -13
  66. data/.release-please-config.json +0 -36
  67. data/.release-please-manifest.json +0 -3
  68. data/.rspec +0 -2
  69. data/.rubocop.yml +0 -44
  70. data/.rubocop_todo.yml +0 -30
  71. data/.yard-lint.yml +0 -75
  72. data/CLAUDE.md +0 -11
  73. data/Gemfile +0 -22
  74. data/Rakefile +0 -41
  75. data/docker/test/Dockerfile +0 -32
  76. data/docker/test/docker-compose.yml +0 -0
  77. data/package.json +0 -10
  78. data/redesign/1_architecture_existing.md +0 -102
  79. data/redesign/2_architecture_redesign.md +0 -449
  80. data/redesign/3_architecture_implementation.md +0 -1623
  81. data/redesign/Phase 4 - Step A.md +0 -366
  82. data/redesign/Phase 4 - Step B.md +0 -921
  83. data/redesign/Phase 4 - Step C.md +0 -833
  84. data/redesign/beta_release.md +0 -107
  85. data/redesign/branch_parse_refactor_plan.md +0 -163
  86. data/redesign/c1a-public-api-scope.tsv +0 -256
  87. data/redesign/c1c2_audit.md +0 -566
  88. data/redesign/c1c2_bucket6_lib_orphans.md +0 -626
  89. data/redesign/config_design.rb +0 -501
  90. data/redesign/index.md +0 -34
  91. data/redesign/info_object_migration_plan.md +0 -126
  92. data/redesign/integration_test_analysis.md +0 -521
  93. data/redesign/phase-4-step-b-test-audit.tsv +0 -485
  94. data/redesign/remote_refactor_plan.md +0 -164
  95. data/redesign/reverse_dependencies.sql +0 -44
  96. data/tasks/gem_tasks.rake +0 -14
  97. data/tasks/npm_tasks.rake +0 -7
  98. data/tasks/rspec.rake +0 -111
  99. data/tasks/rubocop.rake +0 -5
  100. data/tasks/test_gem.rake +0 -12
  101. data/tasks/yard.rake +0 -57
data/CONTRIBUTING.md CHANGED
@@ -42,9 +42,10 @@
42
42
  - [Issue and PR references](#issue-and-pr-references)
43
43
  - [Testing guidelines](#testing-guidelines)
44
44
  - [Test coverage policy](#test-coverage-policy)
45
- - [Unit tests vs Integration tests](#unit-tests-vs-integration-tests)
45
+ - [Unit tests vs integration tests](#unit-tests-vs-integration-tests)
46
+ - [What ships in the gem](#what-ships-in-the-gem)
46
47
  - [Building a specific version of the Git command-line](#building-a-specific-version-of-the-git-command-line)
47
- - [Install pre-requisites](#install-pre-requisites)
48
+ - [Install prerequisites](#install-prerequisites)
48
49
  - [Obtain Git source code](#obtain-git-source-code)
49
50
  - [Build git](#build-git)
50
51
  - [Use the new Git version](#use-the-new-git-version)
@@ -53,9 +54,8 @@
53
54
 
54
55
  Thank you for your interest in contributing to the `ruby-git` project.
55
56
 
56
- This document provides guidelines for contributing to the `ruby-git` project. While
57
- these guidelines may not cover every situation, we encourage you to use your best
58
- judgment when contributing.
57
+ This document provides guidelines for contributing to the `ruby-git` project. They
58
+ may not cover every situation, so use your best judgment.
59
59
 
60
60
  If you have suggestions for improving these guidelines, please propose changes via a
61
61
  pull request.
@@ -75,7 +75,7 @@ You can contribute in the following ways:
75
75
 
76
76
  ## How to report an issue or request a feature
77
77
 
78
- `ruby-git` utilizes [GitHub
78
+ `ruby-git` uses [GitHub
79
79
  Issues](https://help.github.com/en/github/managing-your-work-on-github/about-issues)
80
80
  for issue tracking and feature requests.
81
81
 
@@ -96,14 +96,15 @@ prerequisite is missing.
96
96
  | Ruby | `>= 3.2.0` (matches `required_ruby_version` in [`git.gemspec`](git.gemspec)) | A version manager such as [rbenv](https://github.com/rbenv/rbenv), [asdf](https://asdf-vm.com/), [chruby](https://github.com/postmodern/chruby), or [rvm](https://rvm.io/) is recommended so you can match the project's CI matrix. |
97
97
  | Bundler | Any 2.x or 4.x | Install with `gem install bundler`. |
98
98
  | git | `>= 2.28.0` (matches `git.gemspec` `requirements`) | Older git versions are not supported and the test suite will not pass against them. |
99
- | Node.js / npm | Optional | Required only to install the local Conventional Commit `commit-msg` hook (Husky + commitlint). If npm is missing, `bin/setup` will warn and continue CI will still validate commit messages. |
99
+ | Node.js / npm | Optional | Required only to install the local Conventional Commit `commit-msg` hook (Husky + commitlint). If npm is missing, `bin/setup` will warn and continue. CI will still validate commit messages. |
100
+ | [lychee](https://lychee.cli.rs) | `>= 0.24.0` | Runs the markdown link check (`rake markdown:links`), which is part of the default task. The floor comes from [`.lychee.toml`](.lychee.toml): older releases cannot parse the enum form of `include_fragments`. Install with `brew install lychee` (macOS), `snap install lychee` (Ubuntu), `pacman -S lychee` (Arch), `winget install --id lycheeverse.lychee` (Windows), or see the [install docs](https://github.com/lycheeverse/lychee#installation). |
100
101
 
101
102
  #### A note for Windows contributors
102
103
 
103
104
  A few unit specs create real symlinks, which on Windows requires
104
105
  `SeCreateSymbolicLinkPrivilege`. A non-elevated process only holds that privilege
105
106
  when Developer Mode is enabled (Settings → System → For developers). Without it
106
- those specs skip rather than fail, so `bundle exec rake` still passes but the
107
+ those specs skip rather than fail, so `bundle exec rake` still passes, but the
107
108
  behavior they cover goes unverified locally.
108
109
 
109
110
  The same privilege decides whether Git for Windows materializes the committed
@@ -121,7 +122,8 @@ bin/setup
121
122
  `bin/setup` will:
122
123
 
123
124
  1. Verify the prerequisites above and exit with a non-zero status if any are
124
- missing or out of date.
125
+ missing, or if Ruby, git, or lychee is out of date. (Bundler is only
126
+ checked for presence, not version.)
125
127
  2. Run `bundle install` to install Ruby gem dependencies.
126
128
  3. Run `npm install` (when npm is available) to install the Conventional Commit
127
129
  `commit-msg` hook used by this project (Husky + commitlint). A separate
@@ -129,6 +131,12 @@ bin/setup
129
131
  protected branches (`main`, `4.x`).
130
132
  4. Verify the toolchain by running `bundle exec rake --tasks`.
131
133
 
134
+ `bin/setup` checks for [lychee](https://lychee.cli.rs) alongside Ruby, git, and
135
+ Bundler, and exits non-zero when it is missing or too old. lychee is a Rust binary
136
+ rather than a gem, so `bundle install` cannot supply it and `bin/setup` cannot
137
+ install it for you. Every platform this project supports has a packaged build,
138
+ and the error message names the command for yours.
139
+
132
140
  ### Verify the toolchain
133
141
 
134
142
  Once `bin/setup` succeeds, confirm the full test and lint suite passes locally:
@@ -137,21 +145,29 @@ Once `bin/setup` succeeds, confirm the full test and lint suite passes locally:
137
145
  bundle exec rake
138
146
  ```
139
147
 
140
- This is the same default task that runs in CI and is the canonical way to
141
- validate a change before requesting review.
148
+ This runs everything CI checks: specs, RuboCop, the markdown link check, YARD,
149
+ and the gem build. It is the canonical way to validate a change before
150
+ requesting review.
151
+
152
+ One caveat on the `links` task: passing locally does not guarantee the CI job
153
+ passes, and the gap is the environment rather than the tool. A link whose
154
+ capitalization is wrong resolves on a case-insensitive filesystem such as macOS and
155
+ 404s on the Linux runner, so `](docs/README.MD)` against a file named `README.md`
156
+ looks fine locally and fails in CI. [`tasks/markdown.rake`](tasks/markdown.rake) lists
157
+ this and the other differences. CI remains the authoritative link check.
142
158
 
143
159
  ### Contributor validation policy
144
160
 
145
161
  Contributors are expected to run `bundle exec rake` locally and confirm it
146
- passes before requesting review on a pull request trivial documentation-only
162
+ passes before requesting review on a pull request. Trivial documentation-only
147
163
  fixes (e.g., typo corrections in markdown files) are excepted. "CI passed" is
148
164
  not a substitute for local validation; it is a backstop. This applies equally to
149
- human-authored and AI-assisted contributions — see
165
+ human-authored and AI-assisted contributions. See
150
166
  [AI-assisted contributions](#ai-assisted-contributions).
151
167
 
152
168
  ## How to submit a code or documentation change
153
169
 
154
- There is a three-step process for submitting code or documentation changes:
170
+ Submitting a code or documentation change has three steps:
155
171
 
156
172
  1. [Commit your changes to a fork of
157
173
  `ruby-git`](#commit-your-changes-to-a-fork-of-ruby-git) using [Conventional
@@ -179,9 +195,9 @@ feature](https://help.github.com/en/github/collaborating-with-issues-and-pull-re
179
195
  Once your pull request is ready for review, request a review from at least one
180
196
  [maintainer](MAINTAINERS.md) and any other contributors you deem necessary.
181
197
 
182
- During the review process, you may need to make additional commits, which should be
183
- squashed. Additionally, you will need to rebase your branch to the latest version of
184
- the target branch (e.g., `main` or `4.x`) before merging.
198
+ During the review process, you may need to make additional commits; squash them.
199
+ You will also need to rebase your branch onto the latest version of the target
200
+ branch (e.g., `main` or `4.x`) before merging.
185
201
 
186
202
  At least one approval from a project maintainer is required before your pull request
187
203
  can be merged. The maintainer is responsible for ensuring that the pull request meets
@@ -194,7 +210,7 @@ Before moving a pull request out of draft or requesting a review, confirm:
194
210
  - [ ] `bundle exec rake` passes locally on your branch (see
195
211
  [Local development setup](#local-development-setup)).
196
212
  - [ ] New or changed code has accompanying tests under `spec/`
197
- (see [Unit tests vs Integration tests](#unit-tests-vs-integration-tests)).
213
+ (see [Unit tests vs integration tests](#unit-tests-vs-integration-tests)).
198
214
  - [ ] Every commit message follows [Conventional Commits](#commit-message-guidelines).
199
215
  - [ ] User-facing changes are documented in `README.md` and/or YARD as appropriate.
200
216
 
@@ -223,7 +239,7 @@ Policy](AI_POLICY.md) before submitting changes. You are responsible for
223
239
  understanding and verifying any AI-assisted work included in PRs and ensuring it
224
240
  meets our standards for quality, security, and licensing.
225
241
 
226
- The **human submitter** not the AI agent is responsible for ensuring that
242
+ The human submitter, not the AI agent, is responsible for ensuring that
227
243
  `bundle exec rake` passes locally before requesting review. This is true even
228
244
  when the change was authored end-to-end by an agent. "The agent ran the tests"
229
245
  and "CI is green" are not substitutes for the submitter running
@@ -239,7 +255,6 @@ every supported agent.
239
255
  | --- | --- | --- |
240
256
  | Project instructions | [`.github/copilot-instructions.md`](.github/copilot-instructions.md) | Claude Code, via an import in [`CLAUDE.md`](CLAUDE.md) |
241
257
  | Skills | [`.github/skills/`](.github/skills/) | Claude Code, via the `.claude/skills` symlink |
242
- | Prompts | [`.github/prompts/`](.github/prompts/) | Claude Code, via wrappers in `.claude/commands/` |
243
258
  | Setup hook | [`.github/hooks/run-bin-setup-once.sh`](.github/hooks/run-bin-setup-once.sh) | Claude Code, via `.claude/settings.json` |
244
259
 
245
260
  Always edit the canonical file. The Claude Code side is a pointer in every case, so
@@ -251,54 +266,55 @@ or an elevated shell). Without it, Windows contributors get a plain text file th
251
266
  and Claude Code silently loads no skills; either enable symlinks or point your agent
252
267
  at [`.github/skills/`](.github/skills/) directly. Copilot is unaffected.
253
268
 
269
+ The symlink stays out of the published gem, so it never reaches users. See
270
+ [What ships in the gem](#what-ships-in-the-gem).
271
+
254
272
  ### Agent skills
255
273
 
256
274
  If you use an AI coding agent that understands repository skills, the
257
275
  [`.github/skills/`](.github/skills/) directory contains optional, project-specific
258
276
  guidance that mirrors maintainer expectations:
259
277
 
260
- - [`project-context`](.github/skills/project-context/SKILL.md) architecture, coding
278
+ - [`project-context`](.github/skills/project-context/SKILL.md): architecture, coding
261
279
  standards, design philosophy, and compatibility requirements
262
- - [`development-workflow`](.github/skills/development-workflow/SKILL.md) TDD workflow
280
+ - [`development-workflow`](.github/skills/development-workflow/SKILL.md): TDD workflow
263
281
  for bug fixes, features, refactoring, and maintenance tasks
264
282
  - [`command-implementation`](.github/skills/command-implementation/SKILL.md) and
265
- [`facade-implementation`](.github/skills/facade-implementation/SKILL.md) guidance for
283
+ [`facade-implementation`](.github/skills/facade-implementation/SKILL.md): guidance for
266
284
  adding or updating command classes and `Git::Repository` facade methods
267
- - [`review-arguments-dsl`](.github/skills/review-arguments-dsl/SKILL.md) audits
285
+ - [`review-arguments-dsl`](.github/skills/review-arguments-dsl/SKILL.md): audits
268
286
  `arguments do ... end` blocks against the git CLI
269
287
  - [`rspec-unit-testing-standards`](.github/skills/rspec-unit-testing-standards/SKILL.md),
270
288
  [`command-test-conventions`](.github/skills/command-test-conventions/SKILL.md), and
271
- [`facade-test-conventions`](.github/skills/facade-test-conventions/SKILL.md) testing
289
+ [`facade-test-conventions`](.github/skills/facade-test-conventions/SKILL.md): testing
272
290
  conventions for new and updated code
273
291
  - [`yard-documentation`](.github/skills/yard-documentation/SKILL.md),
274
292
  [`command-yard-documentation`](.github/skills/command-yard-documentation/SKILL.md), and
275
- [`facade-yard-documentation`](.github/skills/facade-yard-documentation/SKILL.md)
293
+ [`facade-yard-documentation`](.github/skills/facade-yard-documentation/SKILL.md):
276
294
  documentation standards
277
295
  - [`test-debugging`](.github/skills/test-debugging/SKILL.md) and
278
- [`ci-cd-troubleshooting`](.github/skills/ci-cd-troubleshooting/SKILL.md) help for
296
+ [`ci-cd-troubleshooting`](.github/skills/ci-cd-troubleshooting/SKILL.md): help for
279
297
  failing or flaky tests and CI failures
280
- - [`breaking-change-analysis`](.github/skills/breaking-change-analysis/SKILL.md) impact
298
+ - [`breaking-change-analysis`](.github/skills/breaking-change-analysis/SKILL.md): impact
281
299
  analysis before removing methods, changing interfaces, or planning deprecations
282
- - [`pr-readiness-review`](.github/skills/pr-readiness-review/SKILL.md) final checks
300
+ - [`pr-readiness-review`](.github/skills/pr-readiness-review/SKILL.md): final checks
283
301
  before requesting review
284
302
 
285
303
  ## Design philosophy
286
304
 
287
- The `git` gem follows a design philosophy that allows users to leverage their
288
- existing knowledge of Git while benefiting from the expressiveness and power of
289
- Ruby's syntax and paradigms.
305
+ The `git` gem lets users apply what they already know about Git while working in
306
+ idiomatic Ruby.
290
307
 
291
- Its public API is designed as a lightweight wrapper around the `git` command-line
292
- tool, providing Ruby developers with a simple and intuitive interface for
293
- programmatically interacting with Git.
308
+ Its public API is a lightweight wrapper around the `git` command-line tool that
309
+ gives Ruby developers a direct way to run Git programmatically.
294
310
 
295
- This gem adheres to the "principle of least surprise," ensuring that it does not
296
- introduce unnecessary abstraction layers or modify Git's core functionality. Instead,
297
- the gem maintains a close alignment with the existing `git` command-line interface,
298
- avoiding extensions or alterations that could lead to unexpected behaviors.
311
+ This gem follows the principle of least surprise: it does not add unnecessary
312
+ abstraction layers or modify Git's core functionality. It stays close to the existing `git`
313
+ command-line interface and avoids extensions or alterations that could lead to
314
+ unexpected behavior.
299
315
 
300
316
  `git` commands generally translate to `Git::Repository` methods of the same name.
301
- Positional arguments map to the `git` CLI operands (such as paths, SHAs, etc.) in the
317
+ Positional arguments map to the `git` CLI operands (such as paths and SHAs) in the
302
318
  same order. Keyword arguments map to `git` CLI options by long OR short name.
303
319
 
304
320
  Some examples:
@@ -314,7 +330,7 @@ The `git` gem is organized into three architectural layers:
314
330
  | --- | --- | --- |
315
331
  | **Facade** (`Git::Repository` and `Git`) | Public API | Normalizes Ruby arguments, sets safe defaults, calls one or more `Git::Commands::*` classes, and may parse output into public Ruby objects |
316
332
  | **Command** (`Git::Commands::*`) | Neutral git CLI interface | Declares CLI arguments via the [Arguments DSL](lib/git/commands/arguments.rb), builds the git argv and executes git via `#call`, and returns `Git::CommandLine::Result` |
317
- | **Execution** (`Git::ExecutionContext::*`) | Execution context and subprocess defaults | Carries execution settings such as working directory, environment, timeout, binary path, and logging; runs the git CLI with default global options (such as `-c color.ui=false`) and subprocess environment variables (such as a platform-conditional `LC_ALL` `en_US.UTF-8` on macOS, `C.UTF-8` elsewhere) |
333
+ | **Execution** (`Git::ExecutionContext::*`) | Execution context and subprocess defaults | Carries execution settings such as working directory, environment, timeout, binary path, and logging; runs the git CLI with default global options (such as `-c color.ui=false`) and subprocess environment variables (such as a platform-conditional `LC_ALL`, which is `en_US.UTF-8` on macOS and `C.UTF-8` elsewhere) |
318
334
 
319
335
  Command classes (`Git::Commands::*`) are **faithful, neutral representations of the
320
336
  git CLI**. Each command class does the following:
@@ -334,7 +350,7 @@ environment where an editor is desired).
334
350
 
335
351
  For example:
336
352
 
337
- - **Anti-pattern:** declaring non-overidable and non-default options in the Arguments
353
+ - **Anti-pattern:** declaring non-overridable and non-default options in the Arguments
338
354
  DSL to control output such as `literal '--no-edit'`, `literal '--verbose'`, or
339
355
  `literal '--no-progress'` inside a command class. This embeds policy in the wrong
340
356
  layer.
@@ -362,8 +378,8 @@ Implementing the command has two major tasks: [API design](#api-design) and
362
378
 
363
379
  ### API design
364
380
 
365
- The section focuses on deciding where git command methods belong, how to name them,
366
- and how to handle parameters and output. These describe the public interface that gem
381
+ This section covers where git command methods belong, how to name them, and how to
382
+ handle parameters and output. These describe the public interface that gem
367
383
  users will see.
368
384
 
369
385
  #### Method placement
@@ -433,8 +449,7 @@ repo.config_unset('user.name') # git config --unset user.name
433
449
  repo.config_get_all('remote.origin.url') # git config --get-all remote.origin.url
434
450
  ```
435
451
 
436
- To enhance usability, aliases may be introduced to provide more user-friendly method
437
- names where appropriate.
452
+ Aliases may be added to provide friendlier method names where appropriate.
438
453
 
439
454
  See also [Output processing](#output-processing) for when different output formats
440
455
  require separate methods.
@@ -444,21 +459,20 @@ require separate methods.
444
459
  Parsed result objects returned from facade methods follow a reserved suffix
445
460
  convention:
446
461
 
447
- - **`*Info`** a parsed metadata struct returned from a query (e.g., `BranchInfo`,
462
+ - **`*Info`**: a parsed metadata struct returned from a query (e.g., `BranchInfo`,
448
463
  `TagInfo`, `StashInfo`, `DiffInfo`). Always lives in the top-level `Git::`
449
464
  namespace.
450
- - **`*Result`** the outcome of a mutating or destructive operation (e.g.,
465
+ - **`*Result`**: the outcome of a mutating or destructive operation (e.g.,
451
466
  `BranchDeleteResult`, `TagDeleteResult`). Also lives in `Git::`.
452
467
 
453
- Do **not** use these suffixes on `Git::Commands::*` command classes those are
468
+ Do not use these suffixes on `Git::Commands::*` command classes. Those are
454
469
  subprocess runners, not data objects. A reader seeing `Commands::Foo::BarInfo`
455
470
  expects a parsed struct, not a class that shells out to git.
456
471
 
457
472
  #### Parameter naming
458
473
 
459
474
  Parameters within the `git` gem methods are named after their corresponding long
460
- command-line options, ensuring familiarity and ease of use for developers already
461
- accustomed to Git.
475
+ command-line options, so developers already accustomed to Git will recognize them.
462
476
 
463
477
  For example, `git config --global` becomes `global: true`, and `git config --file`
464
478
  becomes `file: '/path/to/config'`.
@@ -506,42 +520,6 @@ accept these via an options splat parameter (e.g., `def replace(object, replacem
506
520
  => 'value' }` or as an array of pairs if multiple are allowed.
507
521
  - `git -c user.name=Scott` → `c: { 'user.name' => 'Scott' }`
508
522
 
509
- - **Mutually exclusive options**: If options are mutually exclusive (e.g.,
510
- `--global`, `--local`, `--system`), only one may be used at a time. Setting more
511
- than one raises `ArgumentError`. The DSL enforces this via `conflicts`
512
- declarations at bind time. For **negatable flag options** (`negatable: true`),
513
- passing `false` (which emits `--no-flag`) also counts as using that option in the
514
- conflict check; non-negatable `false` is treated as absent.
515
-
516
- - **Forbidden value combinations (negatable flags)**: When two negatable flags may
517
- both be present but only certain value pairings are contradictory, use
518
- `forbid_values` declarations instead of (or in addition to) `conflicts`.
519
- `conflicts` is presence-based and blocks all co-presence; `forbid_values` blocks
520
- only the exact `name: value` tuples listed, leaving semantically equivalent pairs
521
- valid. For example, `--all --no-ignore-removal` and `--no-all --ignore-removal`
522
- are equivalent and should remain allowed, while `--all --ignore-removal` and
523
- `--no-all --no-ignore-removal` are contradictory and should be rejected:
524
-
525
- ```ruby
526
- forbid_values all: true, ignore_removal: true # contradictory
527
- forbid_values all: false, ignore_removal: false # contradictory
528
- ```
529
-
530
- Unknown names raise `ArgumentError` at definition time. Alias names are
531
- canonicalized automatically.
532
-
533
- - **Exactly-one required from a mutually exclusive group**: When exactly one of a
534
- group of arguments must be provided (e.g., a command that accepts exactly one of
535
- `--mode-a`, `--mode-b`, or `--mode-c`), omitting all of them or supplying more
536
- than one raises `ArgumentError`. The DSL enforces this via
537
- `requires_exactly_one_of` declarations, which combine `requires_one_of`
538
- (at-least-one) and `conflicts` (at-most-one) in a single declaration.
539
-
540
- - **At-least-one required**: When at least one of a group of arguments (options or
541
- positional) must be provided, but the group is not mutually exclusive, omitting
542
- all of them raises `ArgumentError`. The DSL enforces this via `requires_one_of`
543
- declarations at bind time.
544
-
545
523
  ##### Positional arguments
546
524
 
547
525
  Arguments that are not options (e.g., file names, branch names) are passed as method
@@ -562,7 +540,7 @@ arguments, not as keyword arguments.
562
540
  (required).
563
541
  - `git add [<pathspec>...]` → `def add(*paths)`
564
542
 
565
- - **Mixed single-valued and multi-valued positional arguments `--` separated
543
+ - **Mixed single-valued and multi-valued positional arguments, `--` separated
566
544
  (independently reachable groups)**: When a git command separates two optional
567
545
  groups with `--` (e.g., `[<tree-ish>] [-- <pathspec>...]`), callers may want
568
546
  to supply the post-`--` group *without* supplying the first group. Use the
@@ -577,7 +555,7 @@ arguments, not as keyword arguments.
577
555
  - Callers can then do `checkout(pathspecs: ['file.rb'])` (no branch) or
578
556
  `diff('HEAD~3', pathspec: ['file.rb'])` (both), with no ambiguity.
579
557
 
580
- - **Multiple optional single-valued positional arguments pure nesting
558
+ - **Multiple optional single-valued positional arguments, pure nesting
581
559
  (second only meaningful with first)**: When the git SYNOPSIS shows nested
582
560
  optional brackets and the inner operand is only useful in the presence of the
583
561
  outer one, both arguments may be regular optional parameters in left-to-right
@@ -586,17 +564,43 @@ arguments, not as keyword arguments.
586
564
  - Callers can do `diff` (no args), `diff('HEAD~3')`, or `diff('HEAD~3', 'HEAD')`.
587
565
  There is no case where someone would pass `commit2` without `commit1`.
588
566
 
567
+ ##### Cross-argument constraints
568
+
569
+ Constraints that span arguments — mutually exclusive options, required groups,
570
+ forbidden value combinations — are not validated in Ruby. Command classes pass the
571
+ arguments through and leave the judgment to git. When git rejects a combination,
572
+ the rejection surfaces as a `Git::FailedError` carrying git's own message; a
573
+ combination git accepts, even one it silently ignores, raises nothing. The decision and its rationale are
574
+ recorded in
575
+ [ADR-0003](docs/adr/0003-validation-of-git-semantics-is-delegated-to-git.md).
576
+
577
+ The arguments DSL does provide constraint declarations (`conflicts`, `requires`,
578
+ `requires_one_of`, `requires_exactly_one_of`, `forbid_values`, `allowed_values`),
579
+ which raise `ArgumentError` at bind time. Declare one only when git cannot report
580
+ the error itself, under the two exception criteria defined in
581
+ [Validation Boundaries](.github/skills/project-context/SKILL.md#validation-boundaries):
582
+
583
+ - **The argv-invisible exception**: the argument never appears in git's argv
584
+ (`skip_cli: true` operands, `execution_option` entries), so git has no token to
585
+ object to. The two current uses are `Git::Commands::CatFile::Batch` (`conflicts`
586
+ and `requires_one_of` on its stdin-fed `:object` operand) and
587
+ `Git::Commands::Archive` (`conflicts :output, :out`, where `:out` is a Ruby IO
588
+ object).
589
+ - **The silent-wrong-result exception**: git accepts the combination but silently
590
+ discards data or produces a wrong answer. A declaration under this exception
591
+ needs a code comment explaining why, the git version(s) where the behavior was
592
+ verified, and a test.
593
+
589
594
  These conventions ensure the API is predictable and closely aligned with the git CLI.
590
595
  If a new option type is encountered, extend this section to document the mapping.
591
596
 
592
597
  #### Output processing
593
598
 
594
- The `git` gem translates the output of many Git commands into Ruby objects, making it
599
+ The `git` gem translates the output of many Git commands into Ruby objects that are
595
600
  easier to work with programmatically.
596
601
 
597
- These Ruby objects often include methods that allow for further Git operations where
598
- useful, providing additional functionality while staying true to the underlying Git
599
- behavior.
602
+ These Ruby objects often include methods for further Git operations where useful,
603
+ while staying close to the underlying Git behavior.
600
604
 
601
605
  When a single git command can produce distinctly different output types based on its
602
606
  options, implement separate methods for each output type. Follow the same naming
@@ -613,8 +617,8 @@ repo.diff_stats('HEAD~1', 'HEAD') # Statistical summary (git diff --numstat
613
617
  repo.diff_path_status('HEAD~1', 'HEAD') # File paths and status (git diff --name-status)
614
618
  ```
615
619
 
616
- This approach ensures each method has a clear, predictable return type and allows for
617
- targeted parsing logic appropriate to each output format.
620
+ This gives each method a clear, predictable return type and parsing logic targeted
621
+ to its output format.
618
622
 
619
623
  ### Implementation
620
624
 
@@ -635,7 +639,7 @@ layer responsibilities separate:
635
639
  structured Ruby objects.
636
640
 
637
641
  Steps 2 and 3 correspond to the Command and Facade layers, respectively. The
638
- Execution layer (`Git::ExecutionContext::*`) already exists a command class only
642
+ Execution layer (`Git::ExecutionContext::*`) already exists. A command class only
639
643
  consumes it via `@execution_context`; it is not authored per command.
640
644
 
641
645
  Example structure for `git add`:
@@ -693,7 +697,7 @@ end
693
697
  Here is the corresponding facade method that calls it:
694
698
 
695
699
  ```ruby
696
- # lib/git/repository/staging.rb (facade a topic module included into Git::Repository)
700
+ # lib/git/repository/staging.rb (facade, a topic module included into Git::Repository)
697
701
  module Git
698
702
  class Repository
699
703
  module Staging
@@ -717,20 +721,20 @@ status). Simple commands need only declare `arguments do … end` and inherit
717
721
  `Base#call(*, **)` unchanged. To attach command-specific YARD documentation to the
718
722
  inherited `call`, use either a `# @!method call(*, **)` directive (when there is no
719
723
  `def call` in the class) or place the YARD tags directly above an explicit
720
- `def call(*, **); super; end` both patterns produce identical runtime behavior.
724
+ `def call(*, **); super; end`. Both patterns produce identical runtime behavior.
721
725
  Only add real logic to `def call` when the command needs custom behavior beyond what
722
726
  `Base` provides.
723
727
 
724
728
  Override `call` explicitly in three situations:
725
729
 
726
- 1. **Input validation** guard `ArgumentError` for invalid option combinations that
730
+ 1. **Input validation**: guard `ArgumentError` for invalid option combinations that
727
731
  the DSL cannot express (e.g., empty operands without a compensating flag).
728
- 2. **Stdin via IO pipe** commands using the `--batch` / `--batch-check` protocol
732
+ 2. **Stdin via IO pipe**: commands using the `--batch` / `--batch-check` protocol
729
733
  must feed object names to the subprocess's stdin. Use the inherited
730
734
  `Base#with_stdin(content)`, which opens an `IO.pipe`, writes the string content,
731
- and yields the read end as `in:`. Do not open a pipe manually `StringIO` is
732
- not accepted by `Process.spawn` (it has no file descriptor).
733
- 3. **Non-trivial option routing** when multiple call shapes require different
735
+ and yields the read end as `in:`. Do not open a pipe manually. `StringIO` is
736
+ not accepted by `Process.spawn` because it has no file descriptor.
737
+ 3. **Non-trivial option routing**: when multiple call shapes require different
734
738
  argument sets built separately before dispatching.
735
739
 
736
740
  When overriding, work with `args_definition.bind(...)` directly and delegate
@@ -760,7 +764,7 @@ then the [`Arguments` DSL](lib/git/commands/arguments.rb) raises `ArgumentError`
760
764
  any keyword the command class does not recognize during argument binding. The facade
761
765
  also handles translation from single values or arrays to the splat format.
762
766
 
763
- > **YARD Documentation Note:** Because `call` uses anonymous argument forwarding
767
+ > **YARD documentation note:** Because `call` uses anonymous argument forwarding
764
768
  > (`*, **`), YARD cannot infer its signature. Document it with an `@overload` that names
765
769
  > the operands and an `**options` hash (e.g., `@overload call(*pathspec, **options)`),
766
770
  > add a `@param options [Hash]` tag, and document each supported keyword with its own
@@ -768,7 +772,7 @@ also handles translation from single values or arrays to the splat format.
768
772
  > `# @!method call(*, **)` directive (as shown above); when it defines an explicit
769
773
  > `def call` override, place them directly above that method instead.
770
774
  >
771
- > **Testing Requirement:** When defining arguments with the DSL, you must write RSpec
775
+ > **Testing requirement:** When defining arguments with the DSL, you must write RSpec
772
776
  > tests that verify each argument handles valid values correctly (booleans, strings,
773
777
  > arrays) and handles invalid values appropriately. Use a separate `context` block for
774
778
  > testing each option to ensure clarity and isolation. See
@@ -779,7 +783,7 @@ For factory methods and module-level commands, the pattern is the same but
779
783
  `@execution_context`:
780
784
 
781
785
  ```ruby
782
- # Factory method (Git.clone) creates a global context, runs the command, returns a repository
786
+ # Factory method (Git.clone): creates a global context, runs the command, returns a repository
783
787
  module Git
784
788
  def self.clone(repository_url, directory = nil, options = {})
785
789
  context = Git::ExecutionContext::Global.new
@@ -799,51 +803,42 @@ end
799
803
  The following command classes demonstrate implementation patterns.
800
804
  See `lib/git/commands/` and `spec/unit/git/commands/` for the full implementations:
801
805
 
802
- - **Simple command**: `Git::Commands::Add` straightforward argument building with
806
+ - **Simple command**: `Git::Commands::Add`, straightforward argument building with
803
807
  the [Arguments DSL](lib/git/commands/arguments.rb)
804
808
  - **Command with parser-backed facade result**: `Git::Commands::Fsck` with
805
- `Git::Parsers::Fsck` returns raw command output that the facade parses into
809
+ `Git::Parsers::Fsck`, which returns raw command output that the facade parses into
806
810
  structured Ruby objects
807
- - **Factory command**: `Git::Commands::Clone` used by `Git.clone`; returns a
811
+ - **Factory command**: `Git::Commands::Clone`, used by `Git.clone`; returns a
808
812
  `Git::CommandLine::Result` like all command classes (the factory method then builds
809
813
  and returns a `Git::Repository` from the cloned working tree)
810
- - **Multiple output modes**: `Git::Commands::Diff` declares output-mode options that
814
+ - **Multiple output modes**: `Git::Commands::Diff`, which declares output-mode options that
811
815
  facade methods choose from when building different Ruby-facing results
812
- - **Multi-context command family**: `Git::Commands::ConfigOptionSyntax::*` command
816
+ - **Multi-context command family**: `Git::Commands::ConfigOptionSyntax::*`, command
813
817
  classes shared by module-level and repository-scoped config methods
814
818
 
815
819
  ## Coding standards
816
820
 
817
- To ensure high-quality contributions, all pull requests must meet the following
818
- requirements:
821
+ All pull requests must meet the following requirements:
819
822
 
820
823
  ### Commit message guidelines
821
824
 
822
- To enhance our development workflow, enable automated changelog generation, and pave
823
- the way for Continuous Delivery, the `ruby-git` project has adopted the [Conventional
824
- Commits standard](https://www.conventionalcommits.org/en/v1.0.0/) for all commit
825
- messages.
826
-
827
- This structured approach to commit messages allows us to:
825
+ The `ruby-git` project has adopted the [Conventional Commits
826
+ standard](https://www.conventionalcommits.org/en/v1.0.0/) for all commit messages.
828
827
 
829
- - **Automate versioning and releases:** Tools can now automatically determine the
830
- semantic version bump (patch, minor, major) based on the types of commits merged.
831
- - **Generate accurate changelogs:** We can automatically create and update a
832
- `CHANGELOG.md` file, providing a clear history of changes for users and
833
- contributors.
834
- - **Improve commit history readability:** A standardized format makes it easier for
835
- everyone to understand the nature of changes at a glance.
828
+ Structured commit messages let tools determine the semantic version bump (patch,
829
+ minor, major) from the commits merged and generate an accurate `CHANGELOG.md`
830
+ automatically. A standardized format also makes the history easier to read at a
831
+ glance.
836
832
 
837
833
  #### What does this mean for contributors?
838
834
 
839
- Going forward, all commits to this repository **MUST** adhere to the [Conventional
840
- Commits standard](https://www.conventionalcommits.org/en/v1.0.0/). Commits not
841
- adhering to this standard will cause the CI build to fail. PRs will not be merged if
842
- they include non-conventional commits.
835
+ All commits to this repository must follow the [Conventional Commits
836
+ standard](https://www.conventionalcommits.org/en/v1.0.0/). Commits that do not
837
+ follow it will fail the CI build, and PRs that include them will not be merged.
843
838
 
844
839
  A git `commit-msg` hook (Husky + commitlint) that validates your Conventional
845
840
  Commit messages locally is installed automatically as part of the project
846
- bootstrap see [Local development setup](#local-development-setup). The hook
841
+ bootstrap. See [Local development setup](#local-development-setup). The hook
847
842
  depends on Node.js and npm; if those are not installed, `bin/setup` will warn
848
843
  and skip the hook, and commit-message validation will only run in CI.
849
844
 
@@ -869,12 +864,11 @@ colon:
869
864
 
870
865
  - `feat!: removed Git::Repository#commit_force`
871
866
 
872
- The commit messages will drive how the version is incremented for each release:
867
+ The commit messages drive how the version is incremented for each release:
873
868
 
874
- - a release containing a **breaking change** will do a **major** version increment
875
- - a release containing a **new feature** will do a **minor** increment
876
- - a release containing **neither a breaking change nor a new feature** will do a
877
- **patch** version increment
869
+ - a release containing a breaking change gets a major version increment
870
+ - a release containing a new feature gets a minor increment
871
+ - a release containing neither gets a patch increment
878
872
 
879
873
  The full conventional commit format is:
880
874
 
@@ -891,8 +885,8 @@ The full conventional commit format is:
891
885
  - `optional footers` only uses `BREAKING CHANGE: <description>` where description
892
886
  should describe the nature of the backward incompatibility.
893
887
 
894
- Use of the `BREAKING CHANGE:` footer flags a backward incompatible change even if it
895
- is not flagged with an exclamation mark after the `type`. Other footers are allowed
888
+ The `BREAKING CHANGE:` footer flags a backward incompatible change even if the
889
+ type is not marked with an exclamation mark. Other footers are allowed
896
890
  but not acted upon.
897
891
 
898
892
  See [the Conventional Commits
@@ -906,12 +900,12 @@ triggers a `footer-leading-blank` error.
906
900
 
907
901
  To avoid this:
908
902
 
909
- - **In the body**, omit the `#` when mentioning an issue or PR write `issue 1000`
903
+ - **In the body**, omit the `#` when mentioning an issue or PR: write `issue 1000`,
910
904
  not `issue #1000`.
911
905
  - **In the footer**, always include `#` for closing references:
912
906
  `Closes #1000`, `Fixes #1000`, or `Resolves #1000`.
913
907
  - If you only want to mention an issue for context (not close it), omit the `#` in
914
- the body no footer line is needed.
908
+ the body. No footer line is needed.
915
909
 
916
910
  To validate a commit message before committing:
917
911
 
@@ -946,7 +940,7 @@ process.stdin.on('end', () =>
946
940
  - `rake spec:integration` runs in parallel (via `parallel_tests`) on MRI. Set
947
941
  `PARALLEL_TESTS=false` (or `0`/`no`/`off`) to force serial execution, e.g.
948
942
  `PARALLEL_TESTS=false bundle exec rake spec:integration`. A run narrowed by `SPEC`
949
- to a single spec file always runs serially there is nothing to divide across
943
+ to a single spec file always runs serially. There is nothing to divide across
950
944
  workers, and serial execution gives per-example (documentation) output.
951
945
  - Set `SPEC=<glob>` to run specific files instead of a task's whole directory, e.g.
952
946
  `SPEC=spec/unit/git/version_spec.rb bundle exec rake spec:unit`.
@@ -963,14 +957,14 @@ process.stdin.on('end', () =>
963
957
  ```
964
958
 
965
959
  The glob is expanded by Rake, not the shell, so `**` works the same in any shell.
966
- A task whose directory contains none of the matches is skipped with a message
960
+ A task whose directory contains none of the matches is skipped with a message:
967
961
  `SPEC=spec/unit/...` on `rake spec` runs the unit specs and skips
968
962
  `spec:integration`. A glob matching nothing anywhere fails the task outright.
969
963
 
970
- This project uses **RSpec** (`spec/`) as its sole test framework. Structure,
964
+ This project uses RSpec (`spec/`) as its sole test framework. Structure,
971
965
  naming, setup, stubbing, and coverage rules for unit specs are defined in the
972
966
  [`rspec-unit-testing-standards`](.github/skills/rspec-unit-testing-standards/SKILL.md)
973
- skill follow it when writing or reviewing specs under `spec/unit/`.
967
+ skill. Follow it when writing or reviewing specs under `spec/unit/`.
974
968
 
975
969
  #### Test coverage policy
976
970
 
@@ -980,7 +974,7 @@ below either threshold.
980
974
 
981
975
  This is enforceable without being onerous because unit coverage in this project is
982
976
  deterministic: `lib/` has no Ruby-version, Ruby-engine, or platform conditionals, and
983
- the handful of unit specs that are conditionally skipped are redundant for coverage
977
+ the handful of unit specs that are conditionally skipped are redundant for coverage:
984
978
  every `lib/` line and branch they reach is also reached by a spec that always runs.
985
979
  Every supported MRI runtime therefore measures exactly the same lines and branches, so
986
980
  a coverage failure is always something the pull request introduced.
@@ -993,8 +987,8 @@ failure, which is exactly what the policy exists to prevent.
993
987
 
994
988
  Write the guard the same way the rest of the suite does: a reusable predicate in
995
989
  `spec/spec_helper.rb` (`unless_git`, `unless_command`, `unless_pcre`,
996
- `unless_ci_build`) used as `skip:` metadata, or for a one-off capability that the
997
- `before` block is already exercising a `rescue` in that block that calls `skip`.
990
+ `unless_ci_build`) used as `skip:` metadata, or, for a one-off capability that the
991
+ `before` block is already exercising, a `rescue` in that block that calls `skip`.
998
992
 
999
993
  What the policy does and does not cover:
1000
994
 
@@ -1007,7 +1001,7 @@ What the policy does and does not cover:
1007
1001
  Set `FAIL_ON_LOW_COVERAGE=true` to force enforcement on for a focused run.
1008
1002
  - **A focused run lists gaps only in the code it is about.** The reported percentage is
1009
1003
  always for the whole of `lib/`, but the list of uncovered lines and branches is scoped
1010
- to the files the run tests the classes it describes, plus the `lib/` file each spec
1004
+ to the files the run tests: the classes it describes, plus the `lib/` file each spec
1011
1005
  file mirrors. So a focused run answers "is what I just changed fully covered?" without
1012
1006
  waiting for CI:
1013
1007
 
@@ -1042,7 +1036,7 @@ When a branch is hard to cover, apply these in order:
1042
1036
  state why the code is unreachable, and expect a reviewer to question it. `lib/`
1043
1037
  currently contains no coverage directives.
1044
1038
 
1045
- Use the inline form wherever the exclusion is a single line it applies only to the
1039
+ Use the inline form wherever the exclusion is a single line. It applies only to the
1046
1040
  line it sits on and needs no matching `enable`, which makes it impossible to leave a
1047
1041
  region accidentally open:
1048
1042
 
@@ -1059,8 +1053,8 @@ When a branch is hard to cover, apply these in order:
1059
1053
  # simplecov:enable branch
1060
1054
  ```
1061
1055
 
1062
- Always name the narrowest criterion that solves the problem `line`, `branch`,
1063
- `method`, or a comma-separated combination — and spell it exactly. A word SimpleCov
1056
+ Name the narrowest criterion that solves the problem and spell it exactly:
1057
+ `line`, `branch`, `method`, or a comma-separated combination. A word SimpleCov
1064
1058
  does not recognize is treated as free-form reason text, which silently widens the
1065
1059
  directive to all three criteria instead of failing. Write the reason after the
1066
1060
  criteria, so the required justification lives in the directive itself.
@@ -1084,22 +1078,22 @@ $ open coverage/index.html
1084
1078
  This policy applies to `main` only. The `4.x` maintenance branch predates it and is
1085
1079
  not held to these thresholds.
1086
1080
 
1087
- #### Unit tests vs Integration tests
1081
+ #### Unit tests vs integration tests
1088
1082
 
1089
1083
  This project uses two types of RSpec tests, organized by directory:
1090
1084
 
1091
- - **Unit tests** (`spec/unit/`) - Test individual classes and methods with mocked
1085
+ - **Unit tests** (`spec/unit/`): test individual classes and methods with mocked
1092
1086
  execution context. These verify that the gem builds correct git command arguments
1093
1087
  and properly handles git output. Unit tests should mock `@execution_context` to
1094
1088
  avoid calling real git commands.
1095
1089
 
1096
- - **Integration tests** (`spec/integration/`) - Test the gem's behavior against real
1090
+ - **Integration tests** (`spec/integration/`): test the gem's behavior against real
1097
1091
  git repositories. These verify that mocked assumptions in unit tests match actual
1098
1092
  git behavior. Integration tests create temporary repositories using `Dir.mktmpdir`
1099
1093
  and run real git commands through the gem's public API.
1100
1094
 
1101
- **Purpose of integration tests**: Integration tests validate that the gem correctly
1102
- interacts with git, not that git itself works correctly. They should verify:
1095
+ Integration tests validate that the gem correctly interacts with git, not that git
1096
+ itself works correctly. They should verify:
1103
1097
 
1104
1098
  - That the gem's mocked command expectations match real git output format
1105
1099
  - That the gem correctly handles real git behavior (e.g., unicode in branch names)
@@ -1108,9 +1102,9 @@ interacts with git, not that git itself works correctly. They should verify:
1108
1102
 
1109
1103
  **Integration test guidelines**:
1110
1104
 
1111
- - Keep tests **minimal and purposeful** - only create what's needed for the test
1112
- - Focus on **key behaviors** that unit tests can't verify
1113
- - Don't test git's functionality - test the gem's interaction with git
1105
+ - Keep tests minimal and purposeful; only create what's needed for the test
1106
+ - Focus on key behaviors that unit tests can't verify
1107
+ - Don't test git's functionality; test the gem's interaction with git
1114
1108
  - Use the shared context `'in an empty repository'` for temporary repo setup
1115
1109
  - Use `Git::IntegrationTestHelpers` methods for file operations
1116
1110
  - Each test should verify one specific git interaction pattern
@@ -1137,18 +1131,44 @@ $ bundle exec rspec spec/unit/git/commands/add_spec.rb
1137
1131
  $ GIT_PATH=/Users/james/Downloads/git-2.30.2/bin-wrappers bundle exec rake spec
1138
1132
  ```
1139
1133
 
1134
+ ### What ships in the gem
1135
+
1136
+ `spec.files` in [`git.gemspec`](git.gemspec) is an **allowlist**: the released gem
1137
+ contains `lib/`, the documents [`.yardopts`](.yardopts) names as extra files, plus
1138
+ `UPGRADING.md` and the gemspec itself. Nothing else in the repository is published.
1139
+
1140
+ It used to be a denylist, which meant every new path was published by default. That
1141
+ shipped `.github/`, `tasks/`, the Husky hooks, and the `.claude/skills` symlink to
1142
+ users. The symlink is what forced the change: extracting a symlink requires a
1143
+ privilege Windows grants only under Developer Mode or an elevated shell, so
1144
+ `gem install git` either failed there or, on RubyGems new enough to fall back to a
1145
+ copy, quietly duplicated the whole skills tree into the installed gem.
1146
+
1147
+ What this means when you add a file:
1148
+
1149
+ - **Under `lib/`**: nothing to do; it ships automatically.
1150
+ - **A new top-level document**: add it to `doc_files` in the gemspec if users should
1151
+ get it, and to `.yardopts` if rubydoc.info should render it. The two lists are
1152
+ checked against each other, so a file in `.yardopts` but not the gem fails the
1153
+ suite rather than becoming a broken documentation link.
1154
+ - **Anything else**: it stays out of the gem, which is almost always what you want.
1155
+
1156
+ [`spec/unit/gemspec_spec.rb`](spec/unit/gemspec_spec.rb) enforces all of this: every
1157
+ tracked file under `lib/` is present, no symlink is, and nothing outside `lib/` and
1158
+ the project root is.
1159
+
1140
1160
  ## Building a specific version of the Git command-line
1141
1161
 
1142
1162
  To test with a specific version of the Git command-line, you may need to build that
1143
- version from source code. The following instructions are adapted from Atlassians
1163
+ version from source code. The following instructions are adapted from Atlassian's
1144
1164
  [How to install Git](https://www.atlassian.com/git/tutorials/install-git) page for
1145
1165
  building Git on macOS.
1146
1166
 
1147
- ### Install pre-requisites
1167
+ ### Install prerequisites
1148
1168
 
1149
- Prerequisites only need to be installed if they are not already present.
1169
+ Install prerequisites only if they are not already present.
1150
1170
 
1151
- From your terminal, install Xcodes Command Line Tools:
1171
+ From your terminal, install Xcode's Command Line Tools:
1152
1172
 
1153
1173
  ```shell
1154
1174
  xcode-select --install
@@ -1171,7 +1191,7 @@ code mirror](https://mirrors.edge.kernel.org/pub/software/scm/git/).
1171
1191
  ### Build git
1172
1192
 
1173
1193
  From your terminal, change to the root directory of the extracted source code and run
1174
- the build with following command:
1194
+ the build with the following command:
1175
1195
 
1176
1196
  ```shell
1177
1197
  NO_GETTEXT=1 make CFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib"
@@ -1182,7 +1202,7 @@ directory (e.g., `bin-wrappers/git`).
1182
1202
 
1183
1203
  ### Use the new Git version
1184
1204
 
1185
- To configure programs that use the Git gem to utilize the newly built version, do the
1205
+ To configure programs that use the Git gem to run the newly built version, do the
1186
1206
  following:
1187
1207
 
1188
1208
  ```ruby