Background - validate upstream branch before creating the worktree#308953
Merged
Background - validate upstream branch before creating the worktree#308953
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Copilot chat session worktree creation flow to validate that a base branch’s upstream ref actually resolves before using it as the worktree’s commitish, improving robustness when upstream tracking info is stale or missing.
Changes:
- When a provided
baseBranchhas an upstream configured, compute the upstream ref name and attempt to resolve it before using it as the worktree base. - Add a warning log when the upstream branch cannot be resolved, falling back to the original base branch.
Show a summary per file
| File | Description |
|---|---|
| extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts | Adds upstream-branch resolution/validation logic prior to selecting the worktree base branch. |
Copilot's findings
- Files reviewed: 1/1 changed files
- Comments generated: 1
Contributor
Screenshot ChangesBase: Changed (2)
|
| Before | After |
|---|---|
 |
 |
agentSessionsViewer/WithMarkdownBadge/Light
| Before | After |
|---|---|
 |
 |
chrmarti
approved these changes
Apr 10, 2026
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.
Fixes #308848