fix: Default mappings were not inherited and did not include .gitignore

This fixes #67
chasinglogic · Oct 21, 2024 · c36838a · c36838a
1 parent 855bb7c
commit c36838a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/profiles/mapping.rs b/src/profiles/mapping.rs
@@ -132,11 +132,20 @@ impl From<Vec<Mapping>> for Mapper {
 
 impl From<Option<Vec<Mapping>>> for Mapper {
     fn from(mappings: Option<Vec<Mapping>>) -> Mapper {
-        let configured: Vec<Mapping> = match mappings {
+        let mut configured: Vec<Mapping> = match mappings {
             Some(configured) => configured,
-            None => vec![Mapping::skip("README.*"), Mapping::skip("LICENSE")],
+            None => vec![],
         };
 
+        let default_mappings = vec![
+            Mapping::skip("README.*"),
+            Mapping::skip("LICENSE"),
+            Mapping::skip(".gitignore"),
+            Mapping::skip(".git"),
+            Mapping::skip(".dfm.yml"),
+        ];
+        configured.extend(default_mappings);
+
         Mapper::from(configured)
     }
 }

diff --git a/src/profiles/profile.rs b/src/profiles/profile.rs
@@ -40,7 +40,7 @@ type GitResult = Result<ExitStatus, io::Error>;
 fn is_dotfile(entry: &DirEntry) -> bool {
     let filename = entry.file_name().to_str().unwrap_or("");
     // .git files and .dfm.yml are not dotfiles so should be ignored.
-    let is_sys_file = filename == ".dfm.yml" || filename == ".git" || filename == "README.md";
+    let is_sys_file = filename == ".dfm.yml" || filename == ".git";
     !is_sys_file
 }