Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-30 05:21:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71525 from jmbockhorst/confirmUndoMerge

Browse Source 
Confirm "Undo last commit" if its a merge commit
This commit is contained in:
João Moreno
2019-10-17 07:01:23 -07:00
committed by GitHub
parent 979ca1855d 1297fb0431
commit fd8383a6b0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1483,6 +1483,15 @@ export class CommandCenter {
const commit = await repository.getCommit('HEAD');
if (commit.parents.length > 1) {
const yes = localize('undo commit', "Undo merge commit");
const result = await window.showWarningMessage(localize('merge commit', "The last commit was a merge commit. Are you sure you want to undo it?"), yes);
if (result !== yes) {
return;
}
}
if (commit.parents.length > 0) {
await repository.reset('HEAD~');
} else {