From f3523f3298d518c79216209d8aaee97cbbd3b5a9 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 14 Sep 2016 22:54:10 +0300 Subject: [PATCH] Make "Undo commit" restore correct state of added files Call `git reset --soft` instead of `--mixed`, to add all files from the commit to the index. This fixes IDEA-160606 --- plugins/git4idea/src/git4idea/reset/GitUncommitAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git4idea/src/git4idea/reset/GitUncommitAction.java b/plugins/git4idea/src/git4idea/reset/GitUncommitAction.java index 28b9f447b628..c6d1a7b5cdc6 100644 --- a/plugins/git4idea/src/git4idea/reset/GitUncommitAction.java +++ b/plugins/git4idea/src/git4idea/reset/GitUncommitAction.java @@ -52,7 +52,7 @@ import static com.intellij.util.ObjectUtils.assertNotNull; import static com.intellij.util.containers.ContainerUtil.getFirstItem; import static git4idea.GitUtil.HEAD; import static git4idea.GitUtil.getRepositoryManager; -import static git4idea.reset.GitResetMode.MIXED; +import static git4idea.reset.GitResetMode.SOFT; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; @@ -201,7 +201,7 @@ public class GitUncommitAction extends DumbAwareAction { } // TODO change notification title - new GitResetOperation(project, singletonMap(repository, commit.getParents().get(0)), MIXED, indicator).execute(); + new GitResetOperation(project, singletonMap(repository, commit.getParents().get(0)), SOFT, indicator).execute(); ChangeListManagerImpl changeListManager = ChangeListManagerImpl.getInstanceImpl(project); changeListManager.invokeAfterUpdate(() -> {