fix(worktree): preserve index-hidden changes - #487
Open
testikun wants to merge 1 commit into
Open
Conversation
7 tasks
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.
Problem
Closes #472. Automatic worktree reclamation trusted
git statusand non-forcegit worktree removeto detect local work.assume-unchangedandskip-worktreeindex flags can hide a modified tracked file, allowing the only copy to be deleted.Value
A child worktree is preserved whenever its index contains state that can hide local changes. This prevents silent loss of uncommitted work while retaining the existing automatic cleanup behavior for provably clean worktrees.
Approach
git ls-files -v -zinventory before cleanup.assume-unchanged,skip-worktree, unknown entries, truncated output, or inspection failure.docs/design/WORKTREE_INDEX_SAFETY.md.Validation
node --test --experimental-strip-types tests/extensions/shared/worktree.test.tspassed: 37/37.bun run checkpassed: config contract, discipline ledger, Web build/typecheck, format, lint, and TypeScript typecheck.bun run testpassed: 1476 passed, 1 platform-specific test skipped, 0 failed; Web suite 113/113.Impact