Repository navigation
Never let status.showUntrackedFiles=no hide work from worktree removal (#1519) - #1546
Merged
Merged
Conversation
… removal (#1519) The fast removeWorktreeDir path and git's own non-force `worktree remove` both honour status.showUntrackedFiles=no, so an untracked file read as clean and was deleted. Force untracked=normal (and ignore-submodules=none) on the fast-path check, pass -c status.showUntrackedFiles=normal to every non-force `worktree remove` (fallback, merged reclaim, orphan sweep, GC), and fix the same blind spot in the merge-queue lane preview gate. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
18 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.
Closes #1519. P1 data loss.
When
status.showUntrackedFiles=nois set, git hides untracked files from both its own cleanliness check and plaingit status --porcelain. A worktree holding an agent's uncommitted new files then read as clean, and removal deleted it.Changes
electron/worktrees-lifecycle.jsremoveWorktreeDir: the fast-path check runsstatus --porcelain --untracked-files=normal --ignore-submodules=none, and the fallbackgit worktree removegets-c status.showUntrackedFiles=normal. Worktrees that contain submodules go to git, which refuses to remove them.electron/worktrees-gc.js: the same-coverride on merged-worktree reclaim, the orphan sweep and GC removal.electron/mergeQueue.jspreviewLane: the dirty check on the main checkout now counts untracked files.Tests: a repo with
showUntrackedFiles=noand one untracked file. Removal without force now refuses, and so does the merge-queue preview. The full electron suite passes: 4351 pass, 0 fail.Part of the #1532 gap pass.
🤖 Generated with Claude Code