Repository navigation
fix: keep files of nested repos as upstream has them, with -text in .gitattributes - #225
Merged
Merged
Conversation
This was referenced Nov 13, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #225 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 50 50
Lines 2863 2894 +31
=========================================
+ Hits 2863 2894 +31
|
thorsten-klein
added a commit
that referenced
this pull request
Nov 14, 2026
## What this changes `pull` and `commit` keep the local changes of nested repos inside a nested repo. - Before, `pull` cloned inner nested repos again. Their local changes were lost. Now they come back from HEAD. Then each one is pulled to its new pin. - `commit` does the same after you finish a pull by hand. - No commit has a gitlink where a nested repo belongs. `clone --recurse-submodules` made one for a moment. - `pull --force` still drops all local changes. - If an inner repo stops on conflicts, a new pull does the rest. ## Why Found while working on #184. The `submodules` command (#202) builds on it. Stack: #223 (this) → #224 → #225 → #226 → #202. ## Checklist - [x] `uv run poe all` passes (ruff, mypy, pyright, bandit, complexipy, and the tests at 100% coverage) - [x] New behaviour has a test - [x] README / `--help` / the man page updated, if the change is visible to users - [x] The PR title reads as a [Conventional Commit](https://www.conventionalcommits.org) (`feat:`, `fix:`, `docs:`, …) — it becomes the squash-merge commit message and the changelog line
-text in .gitattributes
thorsten-klein
force-pushed
the
fix/subdir-in-commit-subject
branch
from
November 14, 2026 07:32
d2f6e00 to
5e7f954
Compare
thorsten-klein
added a commit
that referenced
this pull request
Nov 14, 2026
…ed pull <subdir>` (#224) ## What this changes The subject of a nested commit names the subdir: `git nested pull <subdir>` instead of `git nested pull`. ## Why A sync of many nested repos makes many commits. With the same subject for each, `git log --oneline` can't tell them apart. Stack: #223 → #224 → #225 → #226 → #202. ## Checklist - [x] `uv run poe all` passes (ruff, mypy, pyright, bandit, complexipy, and the tests at 100% coverage) - [x] New behaviour has a test - [x] README / `--help` / the man page updated, if the change is visible to users - [x] The PR title reads as a [Conventional Commit](https://www.conventionalcommits.org) (`feat:`, `fix:`, `docs:`, …) — it becomes the squash-merge commit message and the changelog line
For a submodule, the parent's .gitattributes does not count. For a nested repo it does. A rule like `*.bat text eol=crlf` then shows upstream's CRLF files as changed. The tree is never clean, and the next pull refuses. After a clone or pull, git-nested now adds `-text` for these files to the root .gitattributes, in a commit of its own. The content stays as upstream has it.
thorsten-klein
force-pushed
the
fix/keep-upstream-bytes
branch
from
November 14, 2026 07:49
00ac107 to
497fbad
Compare
|
thorsten-klein
added a commit
that referenced
this pull request
Nov 14, 2026
…226) ## What this changes A relative submodule url resolves right against a local Windows path. ## Why A local remote on Windows can have backslashes. `posixpath` took the whole path as one name, so `../foo` became just `foo`. Stack: #223 → #224 → #225 → #226 → #202. ## Checklist - [x] `uv run poe all` passes (ruff, mypy, pyright, bandit, complexipy, and the tests at 100% coverage) - [x] New behaviour has a test - [x] README / `--help` / the man page updated, if the change is visible to users - [x] The PR title reads as a [Conventional Commit](https://www.conventionalcommits.org) (`feat:`, `fix:`, `docs:`, …) — it becomes the squash-merge commit message and the changelog line
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.



What this changes
After a clone or pull, git-nested adds
-textto the root.gitattributesfor files that a rule there would change. This gets a commit of its own. The
files stay as upstream has them.
Why
For a submodule, the parent's
.gitattributesdoes not count. For a nestedrepo it does. A rule like
*.bat text eol=crlfthen shows upstream's CRLFfiles as changed. The tree is never clean, and the next pull refuses.
Stack: #223 → #224 → #225 → #226 → #202.
Checklist
uv run poe allpasses (ruff, mypy, pyright, bandit, complexipy, and thetests at 100% coverage)
--help/ the man page updated, if the change is visible to users(
feat:,fix:,docs:, …) — it becomes the squash-merge commit messageand the changelog line