Skip to content

Approve and resolve act on the wrong folder when a repository and its worktrees are open in one window #8969

Description

@benny5555
  • 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 via git.autoRepositoryDetection: "subFolders" and git.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:

  1. Open a repository root as the workspace folder. Add worktrees under worktrees/2, worktrees/3, ... and list them in git.scanRepositories so the git extension opens them; check out a different open pull request branch in each.
  2. 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 status shows the branch in sync with its upstream.
  3. 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.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Labels

No labels
No labels

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions