From b6876c82aaa1cfde6f1f85ac8a31964d5bbfecb6 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 23 Dec 2016 10:59:12 +0100
Subject: [PATCH] do not delete ignored files from index

---
 plugins/settings-repository/src/BaseRepositoryManager.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/settings-repository/src/BaseRepositoryManager.kt b/plugins/settings-repository/src/BaseRepositoryManager.kt
index 12f200a1317c..e2db6bcafc77 100644
--- a/plugins/settings-repository/src/BaseRepositoryManager.kt
+++ b/plugins/settings-repository/src/BaseRepositoryManager.kt
@@ -139,8 +139,10 @@ abstract class BaseRepositoryManager(protected val dir: Path) : RepositoryManage
       return false
     }
 
-    lock.write {
-      deleteFromIndex(path, isFile)
+    if (!isPathIgnored(path)) {
+      lock.write {
+        deleteFromIndex(path, isFile)
+      }
     }
     return true
   }