Repository navigation
fix(worktree): drop a just-added fork remote when its head fetch fails #15850
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nwparker
merged 1 commit into
main
from
nwparker/Error-invoking-remote-method-worktrees-create-Error-Destructive-git-remote-operations-are-not-allowed-via-exec
Aug 22, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win
Separate persistent remote ownership from invocation-local rollback state. Both setup paths use
remoteCreatedfor two different meanings. A reused remote that another worktree owns can be removed when the new worktree fetch fails.src/main/ipc/worktree-push-target-setup.ts#L111-L113: remove the remote only when this invocation added it.src/main/ipc/worktree-remote.ts#L1126-L1128: apply the same rollback condition for SSH setup.src/main/ipc/worktree-push-target-setup.test.ts#L217-L240: add a failed-fetch case where the reuse callback returnstrue, then assert no removal.src/main/ipc/worktrees-ssh-fork-push-target-remote.test.ts#L215-L268: add the equivalent SSH case for a known owned remote, then assert no removal.📍 Affects 4 files
src/main/ipc/worktree-push-target-setup.ts#L111-L113(this comment)src/main/ipc/worktree-remote.ts#L1126-L1128src/main/ipc/worktree-push-target-setup.test.ts#L217-L240src/main/ipc/worktrees-ssh-fork-push-target-remote.test.ts#L215-L268