Repository navigation
feat: git nested patches create keeps the local changes of a nested repo as patch files - #212
Merged
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #212 +/- ##
==========================================
Coverage 100.00% 100.00%
==========================================
Files 46 49 +3
Lines 2326 2525 +199
==========================================
+ Hits 2326 2525 +199
|
thorsten-klein
force-pushed
the
feat/198-patches-create
branch
2 times, most recently
from
November 13, 2026 19:37
5826420 to
f230ba4
Compare
… repo as patch files
thorsten-klein
force-pushed
the
feat/198-patches-create
branch
from
November 13, 2026 20:02
f230ba4 to
4695ff2
Compare
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.



Fixes #198
First of five stacked PRs for the patches. Each builds on the one before: #212 → #213 → #214 → #215 → #216.
What
patches: <path>in.gitnested: the folder with the local changes as patch files, relative to the subdir. Without it, the patches are off.git nested patches create [<subdir>]:git am,diffandstatusdo not count it.verify --patchesapplies patches withgit amnow, so a plain diff given as a patch is refused.--diffsstill usesgit apply.patchbuild.py: the temporary worktree,git am, and writing the patches.verifyuses it too.Docs
New page
doc/cli/patches.mdand guidedoc/guides/patches.md. Updated the.gitnestedreference,config,verify, the man page and the call diagrams.Tests
New
tests/e2e/test_patches.py. The full suite passes with 100% coverage.