summaryrefslogtreecommitdiff
path: root/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java')
-rw-r--r--plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java20
1 files changed, 13 insertions, 7 deletions
diff --git a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
index 00f1830e6255..e255598e2046 100644
--- a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
+++ b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
@@ -141,15 +141,21 @@ public class GitRollbackEnvironment implements RollbackEnvironment {
}
}
// revert files from HEAD
- for (Map.Entry<VirtualFile, List<FilePath>> entry : toRevert.entrySet()) {
- listener.accept(entry.getValue());
- try {
- revert(entry.getKey(), entry.getValue());
- }
- catch (VcsException e) {
- exceptions.add(e);
+ GitUtil.workingTreeChangeStarted(myProject);
+ try {
+ for (Map.Entry<VirtualFile, List<FilePath>> entry : toRevert.entrySet()) {
+ listener.accept(entry.getValue());
+ try {
+ revert(entry.getKey(), entry.getValue());
+ }
+ catch (VcsException e) {
+ exceptions.add(e);
+ }
}
}
+ finally {
+ GitUtil.workingTreeChangeFinished(myProject);
+ }
LocalFileSystem lfs = LocalFileSystem.getInstance();
HashSet<File> filesToRefresh = new HashSet<File>();
for (Change c : changes) {