fix(checkpoints): allow checkpoints in workspaces with nested git repositories #11360
+691
−75
Conversation
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
0xMink
requested review from
cte,
daniel-lxs,
hannesrudolph,
jr and
mrubens
as code owners
dosubot
bot
added
size:XL
Contributor
Re-reviewed since d4b7e1c. The previously flagged unused import has been removed, and no new issues found. The detect-and-exclude approach with defense-in-depth layering (exclude file, pathspec excludes, gitlink purge, conservative filesystem fallback) looks solid.
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
Comment on lines
11
to
12
| import { fileExistsAtPath } from "../../utils/fs" | ||
| import { arePathsEqual } from "../../utils/path" | ||
| import { executeRipgrep } from "../../services/search/file-search" |
Contributor
There was a problem hiding this comment.
arePathsEqual is imported here but never used anywhere in the file. This is dead code introduced by this PR.
Suggested change
| import { fileExistsAtPath } from "../../utils/fs" | |
| import { arePathsEqual } from "../../utils/path" | |
| import { executeRipgrep } from "../../services/search/file-search" | |
| import { fileExistsAtPath } from "../../utils/fs" | |
| import { executeRipgrep } from "../../services/search/file-search" |
Fix it with Roo Code or mention @roomote and request a fix.
…points Replace the kill switch that disabled checkpoints entirely when nested git repositories were detected. Instead, detect nested repos at init time (via ripgrep dual scan for .git/HEAD and .git pointer files), exclude them from shadow git tracking, and warn the user. Safety enforcement is defense-in-depth: - Anchored exclude patterns in .git/info/exclude - Pathspec excludes in git add - Post-staging gitlink purge with triggered re-detection - Conservative filesystem-based fallback when detection fails - Filtered git add error handling (only suppresses "ignored paths")
0xMink
force-pushed
the
fix/checkpoint-allow-nested-repos
branch
from
51d2e3c to
d4b7e1c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #10636
Closes #11340
Summary
.git/HEADand.gitpointer files (dual ripgrep scan, no--follow).git/info/exclude(anchored patterns) and staging pathspec excludesnested_git_repos_excludedacross all 18 locales (localized translations)Scope note: This PR intentionally does not change
core.worktreecomparison canonicalization. That concern is addressed separately in #11346 (worktree path normalization for Windows). The two PRs are orthogonal — merge order is flexible and there are no code conflicts between them.Test plan
.gitpointer files detected