Honor config.ignore_symlinks when walking the directory trees

ngirard · May 18, 2020 · ca8e0bd · ca8e0bd
1 parent f876603
commit ca8e0bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.6.1] - 2020-05-18
+
+### Fixed
+
+- Honor config.ignore_symlinks when walking the directory trees (thanks to [BartMassey](https://github.com/BartMassey))
 
 ## [0.6.0] – 2020-05-16
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lolcate-rs"
-version = "0.6.0"
+version = "0.6.1"
 description = "A comically fast way of indexing and querying your filesystem. Replaces locate / mlocate / updatedb."
 documentation = "https://github.com/ngirard/lolcate-rs/blob/master/README.md"
 readme = "README.md"

diff --git a/src/main.rs b/src/main.rs
@@ -290,7 +290,7 @@ pub fn walker(config: &config::Config, database: &str) -> ignore::Walk {
     let mut wd = ignore::WalkBuilder::new(&paths[0]);
     wd.hidden(config.ignore_hidden) // Whether to ignore hidden files
         .parents(false) // Don't read ignore files from parent directories
-        .follow_links(true) // Follow symbolic links
+        .follow_links(!config.ignore_symlinks) // Follow symbolic links
         .ignore(true) // Don't read .ignore files
         .git_global(config.gitignore) // Don't read global gitignore file
         .git_ignore(config.gitignore) // Don't read .gitignore files