Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 8 deletions

diff --git a/vendor/gix-glob/src/parse.rs b/vendor/gix-glob/src/parse.rs
index 665f459b9..368cf77c5 100644
--- a/vendor/gix-glob/src/parse.rs
+++ b/vendor/gix-glob/src/parse.rs
@@ -6,22 +6,26 @@ use crate::{pattern, pattern::Mode};
 /// A sloppy parser that performs only the most basic checks, providing additional information
 /// using `pattern::Mode` flags.
 ///
+/// If `may_alter` is `false`, we won't parse leading `!` or its escaped form.
+///
 /// Returns `(pattern, mode, no_wildcard_len)`
-pub fn pattern(mut pat: &[u8]) -> Option<(&[u8], pattern::Mode, Option<usize>)> {
+pub fn pattern(mut pat: &[u8], may_alter: bool) -> Option<(&[u8], pattern::Mode, Option<usize>)> {
     let mut mode = Mode::empty();
     if pat.is_empty() {
         return None;
     };
-    if pat.first() == Some(&b'!') {
-        mode |= Mode::NEGATIVE;
-        pat = &pat[1..];
-    } else if pat.first() == Some(&b'\\') {
-        let second = pat.get(1);
-        if second == Some(&b'!') || second == Some(&b'#') {
+    if may_alter {
+        if pat.first() == Some(&b'!') {
+            mode |= Mode::NEGATIVE;
             pat = &pat[1..];
+        } else if pat.first() == Some(&b'\\') {
+            let second = pat.get(1);
+            if second == Some(&b'!') || second == Some(&b'#') {
+                pat = &pat[1..];
+            }
         }
     }
-    if pat.iter().all(|b| b.is_ascii_whitespace()) {
+    if pat.iter().all(u8::is_ascii_whitespace) {
         return None;
     }
     if pat.first() == Some(&b'/') {