refactor

Author: Byron

gix-refspec/src/match_group/util.rs

@@ -105,7 +105,11 @@ impl<'a> Needle<'a> {
                 Match::GlobRange(*asterisk_pos..end)
             }
             Needle::Pattern(pattern) => {
-                if gix_glob::wildmatch(pattern, item.full_ref_name, gix_glob::wildmatch::Mode::empty()) {
+                if gix_glob::wildmatch(
+                    pattern,
+                    item.full_ref_name,
+                    gix_glob::wildmatch::Mode::NO_MATCH_SLASH_LITERAL,
+                ) {
                     Match::Normal
                 } else {
                     Match::None
@@ -187,9 +191,7 @@ impl<'a> From<RefSpecRef<'a>> for Matcher<'a> {
         };
         if m.rhs.is_none() {
             if let Some(src) = v.src {
-                // Only use Pattern for complex globs (multiple asterisks or other glob features)
-                // Simple single-asterisk globs can use the more efficient Needle::Glob
-                if is_complex_pattern(src) {
+                if must_use_pattern_matching(src) {
                     m.lhs = Some(Needle::Pattern(src));
                 }
             }
@@ -199,11 +201,12 @@ impl<'a> From<RefSpecRef<'a>> for Matcher<'a> {
 }
 
 /// Check if a pattern is complex enough to require wildmatch instead of simple glob matching
-fn is_complex_pattern(pattern: &BStr) -> bool {
+fn must_use_pattern_matching(pattern: &BStr) -> bool {
     let asterisk_count = pattern.iter().filter(|&&b| b == b'*').count();
     if asterisk_count > 1 {
         return true;
     }
-    // Check for other glob features: ?, [, ], \
-    pattern.iter().any(|&b| b == b'?' || b == b'[' || b == b']' || b == b'\\')
+    pattern
+        .iter()
+        .any(|&b| b == b'?' || b == b'[' || b == b']' || b == b'\\')
 }

gix-refspec/tests/refspec/match_group.rs

@@ -214,7 +214,7 @@ mod complex_globs {
     #[test]
     fn one_sided_simple_glob_patterns_match() {
         // Test that simple glob patterns (one asterisk) work correctly with matching
-        let refs = vec![
+        let refs = [
             new_ref("refs/heads/feature/foo", "1111111111111111111111111111111111111111"),
             new_ref("refs/heads/bugfix/bar", "2222222222222222222222222222222222222222"),
             new_ref("refs/tags/v1.0", "3333333333333333333333333333333333333333"),
@@ -277,7 +277,7 @@ mod complex_globs {
     #[test]
     fn one_sided_glob_with_suffix_matches() {
         // Test that glob patterns with suffix work correctly
-        let refs = vec![
+        let refs = [
             new_ref("refs/heads/feature", "1111111111111111111111111111111111111111"),
             new_ref("refs/heads/feat", "2222222222222222222222222222222222222222"),
             new_ref("refs/heads/main", "3333333333333333333333333333333333333333"),

gix/tests/gix/config/tree.rs

@@ -1125,17 +1125,17 @@ mod remote {
 
         assert_eq!(
             Remote::FETCH
-                .try_into_refspec(bcow("*/*/*"), gix_refspec::parse::Operation::Fetch)
+                .try_into_refspec(bcow("*/*/*:refs/heads/*"), gix_refspec::parse::Operation::Fetch)
                 .unwrap_err()
                 .to_string(),
-            "The refspec at \"remote.<name>.fetch=*/*/*\" could not be parsed"
+            "The refspec at \"remote.<name>.fetch=*/*/*:refs/heads/*\" could not be parsed"
         );
         assert_eq!(
             Remote::PUSH
-                .try_into_refspec(bcow("*/*/*"), gix_refspec::parse::Operation::Push)
+                .try_into_refspec(bcow("*/*/*:refs/heads/*"), gix_refspec::parse::Operation::Push)
                 .unwrap_err()
                 .to_string(),
-            "The refspec at \"remote.<name>.push=*/*/*\" could not be parsed"
+            "The refspec at \"remote.<name>.push=*/*/*:refs/heads/*\" could not be parsed"
         );
     }
 }