MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Make "Undo commit" restore correct state of added files

Browse Source 
Call `git reset --soft` instead of `--mixed`, to add all files from
the commit to the index.

This fixes IDEA-160606
This commit is contained in:
Kirill Likhodedov
2016-09-14 23:17:32 +03:00
parent a44fc62d02
commit f3523f3298
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/reset/GitUncommitAction.java
+2 -2
View File
@@ -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(() -> {