Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 19:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - only dispose worktree repository after it has been deleted (#276207)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-11-07 21:55:40 +00:00
committed by GitHub
parent 6293b5452c
commit 89fd28901e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/git/src/commands.ts
View File

@@ -3855,11 +3855,11 @@ export class CommandCenter {
return;
}
// Dispose worktree repository
this.model.disposeRepository(repository);
try {
await mainRepository.deleteWorktree(repository.root);
// Dispose worktree repository
this.model.disposeRepository(repository);
} catch (err) {
if (err.gitErrorCode === GitErrorCodes.WorktreeContainsChanges) {
const forceDelete = l10n.t('Force Delete');
@@ -3867,8 +3867,9 @@ export class CommandCenter {
const choice = await window.showWarningMessage(message, { modal: true }, forceDelete);
if (choice === forceDelete) {
await mainRepository.deleteWorktree(repository.root, { force: true });
} else {
await this.model.openRepository(repository.root);
// Dispose worktree repository
this.model.disposeRepository(repository);
}
return;