Merge branch 'match_ceiling_dir_or_error'

Byron · Byron · commit cda5b51f3b39 · 2023-12-18T15:14:26.000+01:00
diff --git a/gix-discover/src/upwards/types.rs b/gix-discover/src/upwards/types.rs
@@ -87,16 +87,12 @@ impl Options<'_> {
     ///
     /// Note that `GIT_DISCOVERY_ACROSS_FILESYSTEM` for `cross_fs` is **not** read,
     /// as it requires parsing of `git-config` style boolean values.
-    ///
-    /// In addition, this function disables `match_ceiling_dir_or_error` to allow
-    /// discovery if an outside environment variable sets non-matching ceiling directories.
     // TODO: test
     pub fn apply_environment(mut self) -> Self {
         let name = "GIT_CEILING_DIRECTORIES";
         if let Some(ceiling_dirs) = env::var_os(name) {
             self.ceiling_dirs = parse_ceiling_dirs(&ceiling_dirs);
         }
-        self.match_ceiling_dir_or_error = false;
         self
     }
 }
diff --git a/gix/src/discover.rs b/gix/src/discover.rs
@@ -63,6 +63,12 @@ impl ThreadSafeRepository {
     ///
     /// Finally, use the `trust_map` to determine which of our own repository options to use
     /// based on the trust level of the effective repository directory.
+    ///
+    /// ### Note
+    ///
+    /// Consider to set [`match_ceiling_dir_or_error = false`](gix_discover::upwards::Options::match_ceiling_dir_or_error)
+    /// to allow discovery if an outside environment variable sets non-matching ceiling directories for greater
+    /// compatibility with Git.
     #[momo]
     pub fn discover_with_environment_overrides_opts(
         directory: impl AsRef<Path>,

Original file line number	Diff line number	Diff line change
`@@ -87,16 +87,12 @@ impl Options<'_> {`
`87`	`87`	`///`
`88`	`88`	/// Note that `GIT_DISCOVERY_ACROSS_FILESYSTEM` for `cross_fs` is not read,
`89`	`89`	/// as it requires parsing of `git-config` style boolean values.
`90`		`- ///`
`91`		- /// In addition, this function disables `match_ceiling_dir_or_error` to allow
`92`		`- /// discovery if an outside environment variable sets non-matching ceiling directories.`
`93`	`90`	`// TODO: test`
`94`	`91`	`pub fn apply_environment(mut self) -> Self {`
`95`	`92`	`let name = "GIT_CEILING_DIRECTORIES";`
`96`	`93`	`if let Some(ceiling_dirs) = env::var_os(name) {`
`97`	`94`	`self.ceiling_dirs = parse_ceiling_dirs(&ceiling_dirs);`
`98`	`95`	`}`
`99`		`- self.match_ceiling_dir_or_error = false;`
`100`	`96`	`self`
`101`	`97`	`}`
`102`	`98`	`}`