explicitly ignore '.git' folder on Windows

Resolves #2141.
rstudio · Mar 27, 2018 · 1ccc001 · 1ccc001
1 parent bc4831c
commit 1ccc001
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/cpp/core/system/file_monitor/Win32FileMonitor.cpp b/src/cpp/core/system/file_monitor/Win32FileMonitor.cpp
@@ -19,6 +19,7 @@
 
 #include <memory>
 
+#include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
@@ -488,6 +489,20 @@ Error readDirectoryChanges(FileEventContext* pContext)
    }
 }
 
+bool gitFilter(const FileInfo& fileInfo,
+               const boost::function<bool(const FileInfo&)>& filter)
+{
+   // screen out '.git' folder
+   if (fileInfo.isDirectory() &&
+       boost::algorithm::ends_with(fileInfo.absolutePath(), ".git"))
+   {
+      return false;
+   }
+
+   // delegate to registered filter
+   return filter(fileInfo);
+}
+
 } // anonymous namespace
 
 namespace detail {
@@ -555,7 +570,7 @@ Handle registerMonitor(const core::FilePath& filePath,
    core::system::FileScannerOptions options;
    options.recursive = recursive;
    options.yield = true;
-   options.filter = filter;
+   options.filter = boost::bind(gitFilter, _1, filter);
    error = scanFiles(FileInfo(filePath), options, &pContext->fileTree);
    if (error)
    {