git4idea: IDEA-40779(partial): changes are now collected even if process was cancelled

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index b1007603e9eaaae99c60ed485a9ffe8ee7bdae05..887244313b5c24bba932828363ebfb6c9773433a 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
@@ -109,11 +109,9 @@ public class GitUpdateProcess extends GitBaseRebaseProcess {
    */
   @Override
   protected void markEnd(VirtualFile root, final boolean cancelled) {
-    if (!cancelled) {
-      // find out what have changed
-      MergeChangeCollector collector = new MergeChangeCollector(myProject, root, myBefore, myUpdatedFiles);
-      collector.collect(myExceptions);
-    }
+    // find out what have changed, this is done even if the process was cancelled.
+    MergeChangeCollector collector = new MergeChangeCollector(myProject, root, myBefore, myUpdatedFiles);
+    collector.collect(myExceptions);
   }
 
   /**