diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
| commit | 9918693037dce8aa4bb6f08741b6812923486c18 (patch) | |
| tree | 21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /vendor/gix-config/src/source.rs | |
| parent | Releasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff) | |
| download | rustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-config/src/source.rs')
| -rw-r--r-- | vendor/gix-config/src/source.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vendor/gix-config/src/source.rs b/vendor/gix-config/src/source.rs index d8ca60db4..18d396e8b 100644 --- a/vendor/gix-config/src/source.rs +++ b/vendor/gix-config/src/source.rs @@ -65,9 +65,15 @@ impl Source { pub fn storage_location(self, env_var: &mut dyn FnMut(&str) -> Option<OsString>) -> Option<Cow<'static, Path>> { use Source::*; match self { - GitInstallation => gix_path::env::installation_config().map(Into::into), + GitInstallation => { + if env_var("GIT_CONFIG_NOSYSTEM").is_some() { + None + } else { + gix_path::env::installation_config().map(Into::into) + } + } System => { - if env_var("GIT_CONFIG_NO_SYSTEM").is_some() { + if env_var("GIT_CONFIG_NOSYSTEM").is_some() { None } else { env_var("GIT_CONFIG_SYSTEM") |