From bdba72b41a9a3bcb294834a7cfd6421d2e90a938 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 3 Apr 2018 15:11:03 +0300
Subject: [PATCH] IDEA-189369 vcs: do not include file to commit on destroying
 empty tracker

---
 .../changes/ui/MultipleLocalChangeListsBrowser.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleLocalChangeListsBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleLocalChangeListsBrowser.java
index 6703339b0af4..ca6786f188a3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleLocalChangeListsBrowser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleLocalChangeListsBrowser.java
@@ -532,11 +532,13 @@ public class MultipleLocalChangeListsBrowser extends CommitDialogChangesBrowser
               myTrackerExclusionStates.remove(change);
 
               ExclusionState exclusionState = ((PartialLocalLineStatusTracker)tracker).getExcludedFromCommitState(myChangeList.getId());
-              if (exclusionState != ExclusionState.ALL_EXCLUDED) {
-                myIncludedChanges.add(change);
-              }
-              else {
-                myIncludedChanges.remove(change);
+              if (exclusionState != ExclusionState.NO_CHANGES) {
+                if (exclusionState != ExclusionState.ALL_EXCLUDED) {
+                  myIncludedChanges.add(change);
+                }
+                else {
+                  myIncludedChanges.remove(change);
+                }
               }
 
               scheduleExclusionStatesUpdate();