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 - do not show warning dialog when you do a non-interactive worktree migration (#276177)

Browse Source 
* Git - do not show warning dialog when you do a non-interactive worktree migration

* Fix condition 🤦‍♂️
This commit is contained in:
Ladislau Szomoru
2025-11-07 20:31:18 +00:00
committed by GitHub
parent 6e14077b6d
commit cc5d8fd3ee
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3462,12 +3462,15 @@ export class CommandCenter {
return;
}
const message = l10n.t('Proceed with migrating changes to the current repository?');
const detail = l10n.t('This will apply the worktree\'s changes to this repository and discard changes in the worktree.\nThis is IRREVERSIBLE!');
const proceed = l10n.t('Proceed');
const pick = await window.showWarningMessage(message, { modal: true, detail }, proceed);
if (pick !== proceed) {
return;
if (worktreeUri === undefined) {
// Non-interactive migration, do not show confirmation dialog
const message = l10n.t('Proceed with migrating changes to the current repository?');
const detail = l10n.t('This will apply the worktree\'s changes to this repository and discard changes in the worktree.\nThis is IRREVERSIBLE!');
const proceed = l10n.t('Proceed');
const pick = await window.showWarningMessage(message, { modal: true, detail }, proceed);
if (pick !== proceed) {
return;
}
}
await worktreeRepository.createStash(undefined, true);