Skip to content

Commit 4075a14

Browse files
Git: refine Delete worktree... command to populate repo picker if necessary (microsoft#257279)
refine Delete worktree... command
1 parent 2b37aec commit 4075a14

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

extensions/git/src/commands.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,18 +3525,10 @@ export class CommandCenter {
35253525
}
35263526
}
35273527

3528-
@command('git.deleteWorktreeFromPalette')
3529-
async deleteWorktreeFromPalette(): Promise<void> {
3530-
const mainRepository = this.model.repositories.find(repo =>
3531-
!repo.dotGit.commonPath
3532-
);
3533-
3534-
if (!mainRepository) {
3535-
return;
3536-
}
3537-
3528+
@command('git.deleteWorktreeFromPalette', { repository: true, repositoryFilter: ['repository', 'submodule'] })
3529+
async deleteWorktreeFromPalette(repository: Repository): Promise<void> {
35383530
const worktreePicks = async (): Promise<WorktreeDeleteItem[] | QuickPickItem[]> => {
3539-
const worktrees = await mainRepository.getWorktrees();
3531+
const worktrees = await repository.getWorktrees();
35403532
return worktrees.length === 0
35413533
? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
35423534
: worktrees.map(worktree => new WorktreeDeleteItem(worktree));
@@ -3546,7 +3538,7 @@ export class CommandCenter {
35463538
const choice = await this.pickRef<WorktreeDeleteItem | QuickPickItem>(worktreePicks(), placeHolder);
35473539

35483540
if (choice instanceof WorktreeDeleteItem) {
3549-
await choice.run(mainRepository);
3541+
await choice.run(repository);
35503542
}
35513543
}
35523544

0 commit comments

Comments
 (0)