Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - detect worktrees when opening a worktree (#258980)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-07-31 10:52:07 +00:00
committed by GitHub
parent cc28f165ce
commit 0b25736ee6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/git/src/git.ts
View File

@@ -2786,14 +2786,9 @@ export class Repository {
return [];
}
if (this.kind !== 'repository') {
this.logger.info('[Git][getWorktreesFS] Either a submodule or a worktree, skipping worktree detection');
return [];
}
try {
// List all worktree folder names
const worktreesPath = path.join(this.repositoryRoot, '.git', 'worktrees');
const worktreesPath = path.join(this.dotGit.commonPath ?? this.dotGit.path, 'worktrees');
const dirents = await fs.readdir(worktreesPath, { withFileTypes: true });
const result: Worktree[] = [];
@@ -2812,7 +2807,7 @@ export class Repository {
result.push({
name: dirent.name,
// Remove '/.git' suffix
path: gitdirContent.replace(/\.git.*$/, ''),
path: gitdirContent.replace(/\/.git.*$/, ''),
// Remove 'ref: ' prefix
ref: headContent.replace(/^ref: /, ''),
});