fix: make sure ordinary capitalized partial names can be found by partial name.

For instance, previously, a ref named `A` could not be found even though `refs/heads/A` existed.

Author: Byron

gix-ref/src/name.rs

@@ -62,16 +62,21 @@ impl PartialNameRef {
 }
 
 impl PartialNameRef {
-    pub(crate) fn looks_like_full_name(&self) -> bool {
+    pub(crate) fn looks_like_full_name(&self, consider_pseudo_ref: bool) -> bool {
         let name = self.0.as_bstr();
         name.starts_with_str("refs/")
             || name.starts_with(Category::MainPseudoRef.prefix())
             || name.starts_with(Category::LinkedPseudoRef { name: "".into() }.prefix())
-            || is_pseudo_ref(name)
+            || (consider_pseudo_ref && is_pseudo_ref(name))
     }
-    pub(crate) fn construct_full_name_ref<'buf>(&self, inbetween: &str, buf: &'buf mut BString) -> &'buf FullNameRef {
+    pub(crate) fn construct_full_name_ref<'buf>(
+        &self,
+        inbetween: &str,
+        buf: &'buf mut BString,
+        consider_pseudo_ref: bool,
+    ) -> &'buf FullNameRef {
         buf.clear();
-        if !self.looks_like_full_name() {
+        if !self.looks_like_full_name(consider_pseudo_ref) {
             buf.push_str("refs/");
         }
         if !inbetween.is_empty() {

gix-ref/src/store/file/find.rs

@@ -6,6 +6,7 @@ use std::{
 
 pub use error::Error;
 
+use crate::name::is_pseudo_ref;
 use crate::{
     file,
     store_impl::{file::loose, packed},
@@ -103,13 +104,28 @@ impl file::Store {
         let precomposed_partial_name = precomposed_partial_name_storage
             .as_ref()
             .map(std::convert::AsRef::as_ref);
-        for inbetween in &["", "tags", "heads", "remotes"] {
-            match self.find_inner(inbetween, partial_name, precomposed_partial_name, packed, &mut buf) {
-                Ok(Some(r)) => return Ok(Some(decompose_if(r, precomposed_partial_name.is_some()))),
-                Ok(None) => {
-                    continue;
+        for consider_pseudo_ref in [true, false] {
+            if !consider_pseudo_ref && !is_pseudo_ref(partial_name.as_bstr()) {
+                break;
+            }
+            'try_directories: for inbetween in &["", "tags", "heads", "remotes"] {
+                match self.find_inner(
+                    inbetween,
+                    partial_name,
+                    precomposed_partial_name,
+                    packed,
+                    &mut buf,
+                    consider_pseudo_ref,
+                ) {
+                    Ok(Some(r)) => return Ok(Some(decompose_if(r, precomposed_partial_name.is_some()))),
+                    Ok(None) => {
+                        if consider_pseudo_ref && is_pseudo_ref(partial_name.as_bstr()) {
+                            break 'try_directories;
+                        }
+                        continue;
+                    }
+                    Err(err) => return Err(err),
                 }
-                Err(err) => return Err(err),
             }
         }
         if partial_name.as_bstr() != "HEAD" {
@@ -129,6 +145,7 @@ impl file::Store {
                     .map(std::convert::AsRef::as_ref),
                 None,
                 &mut buf,
+                true, /* consider-pseudo-ref */
             )
             .map(|res| res.map(|r| decompose_if(r, precomposed_partial_name_storage.is_some())))
         } else {
@@ -143,10 +160,11 @@ impl file::Store {
         precomposed_partial_name: Option<&PartialNameRef>,
         packed: Option<&packed::Buffer>,
         path_buf: &mut BString,
+        consider_pseudo_ref: bool,
     ) -> Result<Option<Reference>, Error> {
         let full_name = precomposed_partial_name
             .unwrap_or(partial_name)
-            .construct_full_name_ref(inbetween, path_buf);
+            .construct_full_name_ref(inbetween, path_buf, consider_pseudo_ref);
         let content_buf = self.ref_contents(full_name).map_err(|err| Error::ReadFileContents {
             source: err,
             path: self.reference_path(full_name),

gix-ref/src/store/packed/find.rs

@@ -17,15 +17,15 @@ impl packed::Buffer {
         let name = name.try_into()?;
         let mut buf = BString::default();
         for inbetween in &["", "tags", "heads", "remotes"] {
-            let (name, was_absolute) = if name.looks_like_full_name() {
+            let (name, was_absolute) = if name.looks_like_full_name(false) {
                 let name = FullNameRef::new_unchecked(name.as_bstr());
                 let name = match transform_full_name_for_lookup(name) {
                     None => return Ok(None),
                     Some(name) => name,
                 };
                 (name, true)
             } else {
-                let full_name = name.construct_full_name_ref(inbetween, &mut buf);
+                let full_name = name.construct_full_name_ref(inbetween, &mut buf, false);
                 (full_name, false)
             };
             match self.try_find_full_name(name)? {

gix-ref/tests/Cargo.toml

@@ -17,7 +17,7 @@ serde = ["gix-ref/serde"]
 
 [[test]]
 name = "refs"
-path = "refs.rs"
+path = "refs/main.rs"
 
 [dev-dependencies]
 gix-ref = { path = ".." }

gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar

@@ -7,6 +7,7 @@ git checkout -q -b main
 git commit -q --allow-empty -m c1
 git branch dt1
 git branch d1
+git branch A
 
 mkdir -p .git/refs/remotes/origin
 

gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar

@@ -6,6 +6,7 @@ git init -q
 git checkout -q -b main
 git commit -q --allow-empty -m c1
 git branch newer-as-loose
+git branch A
 git tag -m "tag object" tag-object
 
 mkdir -p .git/refs/remotes/origin

gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar

@@ -7,6 +7,7 @@ git checkout -q -b main
 git commit -q --allow-empty -m c1
 git branch dt1
 git branch d1
+git branch A
 
 mkdir -p .git/refs/remotes/origin