Repository navigation
Preserve all work during owner-authorized retirement - #488
Merged
Merged
Conversation
prune keeps unmerged work forever because it has no merge proof. retire replaces that proof with a verified snapshot: dirty tracked and untracked files become a commit on the tip (built in a temporary index), unknown ignored data becomes a 0600 ignored.tar, and both go through the existing bundle/restore/fsck archive. Open PRs, active processes, Git operations, locks, hidden index entries and a moved tip still preserve the work. Removal stays non-forced and the branch is deleted by expected SHA. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This was referenced Nov 4, 2026
This branch was successfully deployed
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.
PR #486 can retire work without matching ownership, lose staged-only content, erase writes that race archival, and delete ignored files even when their archive is missing. This replacement candidate incorporates that feature and repairs all four reproduced defects without modifying its original branch or worktree.
Retirement now requires a valid matching owner record, separately archives the original index and working tree, verifies raw working and ignored archives through empty-directory restores, and persists recovery metadata before moving anything. Nested ignored paths retain their parent-directory modes without archiving sibling data. Ownership and archive integrity are rechecked before expected-SHA branch deletion.
The original checkout and Git registration move to private recovery storage and remain there indefinitely. No reset, clean, or deletion erases their files, so later writes through existing file descriptors remain recoverable. Retirement removes the managed path and local branch name; it does not reclaim the checkout's disk space. The existing merged-worktree pruning path retains its separate merge-proof requirements.
Validation passed: pinned install, build, typecheck, full unit suite (2,325 passed, 26 skipped), 27 retirement cases and 102 standalone maintenance cases. Independent review found a nested-parent archive mismatch; its regression failed first, then passed after the correction, and follow-up review found no actionable issues. No real worktree retirement, release, physical power-loss acceptance, or repair-specific Electron E2E is claimed.
The original PR remains open until this candidate is delivered and its replacement is verified. Recovery and remaining limits are documented in the recovery and validation receipt.