From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 19 Jun 2024 11:26:03 +0200
Subject: Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 vendor/gix-config/src/lib.rs           |  6 +++---
 vendor/gix-config/src/parse/nom/mod.rs |  4 ++--
 vendor/gix-config/src/source.rs        | 10 ++++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'vendor/gix-config/src')

diff --git a/vendor/gix-config/src/lib.rs b/vendor/gix-config/src/lib.rs
index a62163ac3..b1740cdd8 100644
--- a/vendor/gix-config/src/lib.rs
+++ b/vendor/gix-config/src/lib.rs
@@ -31,10 +31,10 @@
 //!
 //! ## Feature Flags
 #![cfg_attr(
-    feature = "document-features",
-    cfg_attr(doc, doc = ::document_features::document_features!())
+    all(doc, feature = "document-features"),
+    doc = ::document_features::document_features!()
 )]
-#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(all(doc, feature = "document-features"), feature(doc_cfg, doc_auto_cfg))]
 #![deny(missing_docs, rust_2018_idioms, unsafe_code)]
 
 pub mod file;
diff --git a/vendor/gix-config/src/parse/nom/mod.rs b/vendor/gix-config/src/parse/nom/mod.rs
index 3ae45618d..0a1984d94 100644
--- a/vendor/gix-config/src/parse/nom/mod.rs
+++ b/vendor/gix-config/src/parse/nom/mod.rs
@@ -6,7 +6,7 @@ use winnow::{
     error::{ErrorKind, InputError as NomError, ParserError as _},
     prelude::*,
     stream::{Offset as _, Stream as _},
-    token::{one_of, take_till0, take_while},
+    token::{one_of, take_till, take_while},
 };
 
 use crate::parse::{error::ParseNode, section, Comment, Error, Event};
@@ -82,7 +82,7 @@ fn newlines_from(input: &[u8], start: winnow::stream::Checkpoint<&[u8]>) -> usiz
 fn comment<'i>(i: &mut &'i [u8]) -> PResult<Comment<'i>, NomError<&'i [u8]>> {
     (
         one_of([';', '#']),
-        take_till0(|c| c == b'\n').map(|text: &[u8]| Cow::Borrowed(text.as_bstr())),
+        take_till(0.., |c| c == b'\n').map(|text: &[u8]| Cow::Borrowed(text.as_bstr())),
     )
         .map(|(tag, text)| Comment { tag, text })
         .parse_next(i)
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")
-- 
cgit v1.2.3