fix(cli): Discover config in parent dirs

Ed Page · Ed Page · commit 1a1ff20f4060 · 2021-05-14T14:06:20.000-05:00
My only guess is that in a76ddd4, I lost track of different parts of my change and never re-implemented this logic.
diff --git a/src/policy.rs b/src/policy.rs
@@ -123,8 +123,11 @@ impl<'s> ConfigEngine<'s> {
         let mut config = crate::config::Config::default();
 
         if !self.isolated {
-            if let Some(derived) = crate::config::Config::from_dir(cwd)? {
-                config.update(&derived);
+            for ancestor in cwd.ancestors() {
+                if let Some(derived) = crate::config::Config::from_dir(ancestor)? {
+                    config.update(&derived);
+                    break;
+                }
             }
         }
         if let Some(overrides) = self.overrides.as_ref() {

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,11 @@ impl<'s> ConfigEngine<'s> {`
`123`	`123`	`let mut config = crate::config::Config::default();`
`124`	`124`
`125`	`125`	`if !self.isolated {`
`126`		`- if let Some(derived) = crate::config::Config::from_dir(cwd)? {`
`127`		`- config.update(&derived);`
	`126`	`+ for ancestor in cwd.ancestors() {`
	`127`	`+ if let Some(derived) = crate::config::Config::from_dir(ancestor)? {`
	`128`	`+ config.update(&derived);`
	`129`	`+ break;`
	`130`	`+ }`
`128`	`131`	`}`
`129`	`132`	`}`
`130`	`133`	`if let Some(overrides) = self.overrides.as_ref() {`