mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-24 04:09:28 +00:00
Git - do not show warning dialog when you do a non-interactive worktree migration (#276177)
* Git - do not show warning dialog when you do a non-interactive worktree migration
* Fix condition 🤦♂️
This commit is contained in:
@@ -3462,6 +3462,8 @@ export class CommandCenter {
|
||||
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');
|
||||
@@ -3469,6 +3471,7 @@ export class CommandCenter {
|
||||
if (pick !== proceed) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await worktreeRepository.createStash(undefined, true);
|
||||
const stashes = await worktreeRepository.getStashes();
|
||||
|
||||
Reference in New Issue
Block a user