Approve and resolve act on the wrong folder when a repository and its worktrees are open in one window
@alexr00 ci sta già lavorando.
Dal 19/9/2026.
Valutazione
Questa issue non è ancora stata valutata.
Descrizione
- Extension version: 0.166.1
- VSCode Version: 1.138.0 (Windows client, WSL 2 remote)
- OS: Windows 11 host, Ubuntu on WSL 2 running the extension host
- Repository Clone Configuration: single repository, with eight git worktrees under
worktrees/opened as additional repositories viagit.autoRepositoryDetection: "subFolders"andgit.scanRepositories - GitHub Product: GitHub.com
When several open folders are checkouts of the same GitHub repository (a repository plus its worktrees, each on a different pull request branch), two actions go to the wrong folder:
1. Approving from the pull request overview fails although the checkout is in sync.
Opening a description resolves the folder manager by owner and repository name (RepositoriesManager.getManagerForRepository) and takes the first folder with that remote, not the folder the clicked node belongs to. The overview panel is bound to that folder, so PullRequestModel.approve compares another worktree's checked out HEAD with the pull request's remote head and rejects with:
Submitting review failed. The remote head of the pull request branch has changed. Please pull the latest changes from the remote branch before approving.
Which folder is "first" depends on repository discovery order, so the same setup can work in one window and fail after a reload. Approving from the sidebar's active pull request view works, because ReviewManager passes its own folder manager.
2. Resolving a comment thread on the left side of a diff appears to do nothing.
Every ReviewCommentController.hasCommentThread returns true for any review: scheme thread, and resolveCommentHandler picks the handler with the longest root path, so a worktree's controller handles a thread from the main repository. It calls resolveReviewThread on its own pull request model, which does not know the thread. The GitHub mutation still runs (the thread is resolved on github.com), but no change event fires and the editor never updates.
Steps to Reproduce:
- Open a repository root as the workspace folder. Add worktrees under
worktrees/2,worktrees/3, ... and list them ingit.scanRepositoriesso the git extension opens them; check out a different open pull request branch in each. - In the "Changes in Pull Request" view of a worktree that is not the first discovered folder, click the description node and press Approve in the overview. Observe the "remote head ... has changed" error even though
git statusshows the branch in sync with its upstream. - In the same window, open a file diff from the main repository's changes view and click Resolve Conversation on a thread shown in the left editor. Observe that nothing changes in the editor, while the thread is resolved on github.com.
Fix proposed in #8967: resolve the folder from the pull request model (the folder whose GitHub repository owns the model, then the folder that has the pull request checked out, then the remote match), and have review controllers only claim review: threads whose recorded root path is their own repository.
- Lingua principale
- TypeScript
- Stelle
- 2.6k
- Fork
- 796
- Merge medio
- 16h 26m
- PR unite (30g)
- 44
Guida per i contributori
Nessuna guida per i contributori indicizzata per questo repository
Come iniziare
- Leggi tutta la issue e poi la guida ai contributi del progetto.
- Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
- Fai un fork del repository e lavora su un branch.
- Apri una pull request che faccia riferimento al numero della issue.
Altre issue di microsoft/vscode-pull-request-github
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 78/100
-
Issue 3 — Documentation Aperta
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
-
grrrrrrr Aperta~spam
Difficoltà 5/5 Più di una settimana Idoneità per principianti 5/100
-
grrrrrrr Aperta~spam
Difficoltà 5/5 Più di una settimana Idoneità per principianti 1/100
-
microsoft/vscode-pull-request-github#8966 · 1 assegnatario ·
Tutte le issue di microsoft/vscode-pull-request-github
Issue simili
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 84/100
copse-dev/agent-pane#2953 ·
-
Difficoltà 2/5 1-3 ore Idoneità per principianti 84/100
Eynzof/Hermes-CN-Desktop#610 ·
-
[Bug]: Matrix progress drafts fail with "Matrix runtime not initialized" during tool activity Apertabug clawsweeper:linked-pr-open clawsweeper:needs-live-repro clawsweeper:no-new-fix-pr impact:message-loss issue-rating: 🐚 platinum hermit P2 regression
Difficoltà 2/5 1-3 ore Idoneità per principianti 78/100
-
enhancement
Difficoltà 2/5 1-3 ore Idoneità per principianti 68/100
-
calcite-components needs triage refactor
Difficoltà 2/5 1-3 ore Idoneità per principianti 75/100
Esri/calcite-design-system#15203 ·