Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-06 05:38:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Background - validate upstream branch before creating the worktree (#308953)

Browse Source 
* Background - validate upstream branch before creating the worktree

* Pull request feedback
This commit is contained in:
Ladislau Szomoru
2026-04-10 08:55:42 +02:00
committed by GitHub
parent e9d8794d1d
commit eb62869277
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts
+15 -4
View File
@@ -72,6 +72,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
const autoCommit = this.configurationService.getConfig<boolean>(ConfigKey.Advanced.CLIAutoCommitEnabled);
let baseCommit: string | undefined = undefined;
const branch = await this.generateBranchName(branchName, activeRepository);
// When a base branch is provided, we attempt to resolve it, to see whether it has an
@@ -82,8 +83,19 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
// Attempt to resolve the provided base branch
const branchDetails = await this.gitService.getBranch(activeRepository.rootUri, baseBranch);
if (branchDetails?.upstream?.remote && branchDetails.upstream?.name) {
// If the base branch has an upstream, use it as the base for the worktree
baseBranch = `${branchDetails.upstream.remote}/${branchDetails.upstream.name}`;
const upstreamBranchName = `${branchDetails.upstream.remote}/${branchDetails.upstream.name}`;
try {
// Attempt to resolve the upstream branch before using it as the base for the worktree
const upstreamBranch = await this.gitService.getBranch(activeRepository.rootUri, upstreamBranchName);
if (upstreamBranch) {
baseBranch = upstreamBranchName;
baseCommit = upstreamBranch.commit;
}
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
this.logService.warn(`[ChatSessionWorktreeService][_createWorktree] Failed to resolve upstream branch ${upstreamBranchName}. Error: ${errorMessage}`);
}
}
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
@@ -97,8 +109,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
const baseBranchName = baseBranch ?? activeRepository.headBranchName;
const baseBranchProtected = await this.gitService.isBranchProtected(activeRepository.rootUri, baseBranchName);
let baseCommit: string | undefined = undefined;
if (baseBranch) {
if (baseBranch && !baseCommit) {
const refs = await this.gitService.getRefs(activeRepository.rootUri, { pattern: `refs/heads/${baseBranch}` });
baseCommit = refs.length === 1 && refs[0].commit ? refs[0].commit : undefined;
}