Skip to content

fix: offer stash/migrate options when creating a branch with dirty worktree #304986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −1
Open

fix: offer stash/migrate options when creating a branch with dirty worktree #304986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion extensions/git/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3112,7 +3112,31 @@ export class CommandCenter {
return;
}

await repository.branch(branchName, true, target);
try {
await repository.branch(branchName, true, target);
} catch (err) {
if (err.gitErrorCode !== GitErrorCodes.DirtyWorkTree) {
throw err;
}

const stash = l10n.t('Stash & Checkout');
const migrate = l10n.t('Migrate Changes');
const force = l10n.t('Force Checkout');
const choice = await window.showWarningMessage(l10n.t('Your local changes would be overwritten by checkout.'), { modal: true }, stash, migrate, force);

if (choice === force) {
await this.cleanAll(repository);
await repository.branch(branchName, true, target);
} else if (choice === stash || choice === migrate) {
if (await this._stash(repository, true)) {
await repository.branch(branchName, true, target);

if (choice === migrate) {
await this.stashPopLatest(repository);
}
}
}
}
}

private async pickRef<T extends QuickPickItem>(items: Promise<T[]>, placeHolder: string): Promise<T | undefined> {
Expand Down