From 3cd1d28a1d6d35b25be309e0cd28f4b578c26700 Mon Sep 17 00:00:00 2001
From: Constantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Date: Fri, 20 Nov 2009 18:15:09 +0300
Subject: [PATCH] git4idea: IDEA-40779(partial): changes are now collected even
 if process was cancelled

---
 plugins/git4idea/src/git4idea/update/GitUpdateProcess.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index b1007603e9..887244313b 100644
--- 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);
   }
 
   /**
-- 
2.11.4.GIT