From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-config/src/source.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'vendor/gix-config/src/source.rs') 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) -> Option> { 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") -- cgit v1.2.3