Rename prefix test branches

Author: moroten

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

@@ -10,9 +10,12 @@ git branch d1
 git branch A
 
 mkdir -p .git/refs/remotes/origin
+mkdir -p .git/refs/prefix/feature/sub/dir
 
 cp .git/refs/heads/main .git/refs/remotes/origin/
 cp .git/refs/heads/main .git/refs/d1
+cp .git/refs/heads/main .git/refs/prefix/feature-suffix
+cp .git/refs/heads/main .git/refs/prefix/feature/sub/dir/algo
 
 echo "ref: refs/remotes/origin/main" > .git/refs/remotes/origin/HEAD
 echo "notahexsha" > .git/refs/broken

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

@@ -10,13 +10,13 @@ git branch A
 git tag -m "tag object" tag-object
 
 mkdir -p .git/refs/remotes/origin
-mkdir -p .git/refs/heads/sub/dir
+mkdir -p .git/refs/prefix/feature/sub/dir
 
 cp .git/refs/heads/main .git/refs/remotes/origin/
+cp .git/refs/heads/main .git/refs/prefix/feature-suffix
+cp .git/refs/heads/main .git/refs/prefix/feature/sub/dir/algo
 
 echo "ref: refs/remotes/origin/main" > .git/refs/remotes/origin/HEAD
-echo "ref: refs/heads/main" > .git/refs/heads-packed
-echo "ref: refs/heads/main" > .git/refs/heads/sub/dir/packed
 
 git pack-refs --all --prune
 

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

@@ -10,9 +10,12 @@ git branch d1
 git branch A
 
 mkdir -p .git/refs/remotes/origin
+mkdir -p .git/refs/prefix/feature/sub/dir
 
 cp .git/refs/heads/main .git/refs/remotes/origin/
 cp .git/refs/heads/main .git/refs/d1
+cp .git/refs/heads/main .git/refs/prefix/feature-suffix
+cp .git/refs/heads/main .git/refs/prefix/feature/sub/dir/algo
 
 echo "ref: refs/remotes/origin/main" > .git/refs/remotes/origin/HEAD
 echo "notahexsha" > .git/refs/broken
@@ -22,12 +25,6 @@ echo "ref: refs/tags/multi-link-target2" > .git/refs/heads/multi-link-target1
 echo "ref: refs/remotes/origin/multi-link-target3" > .git/refs/tags/multi-link-target2
 git rev-parse HEAD > .git/refs/remotes/origin/multi-link-target3
 
-# Regression test for issue #1934 where prefix refs/m matched refs/heads/main.
-mkdir -p .git/refs/heads/sub/dir
-echo "ref: refs/remotes/origin/main" > .git/refs/heads-loose
-echo "ref: refs/remotes/origin/main" > .git/refs/heads/sub/dir/loose
-echo "ref: refs/remotes/origin/main" > .git/refs/remotes/origin/heads
-
 echo "ref: refs/loop-b" > .git/refs/loop-a
 echo "ref: refs/loop-a" > .git/refs/loop-b
 

gix-ref/tests/fixtures/make_packed_ref_repository.sh

@@ -255,7 +255,7 @@ fn no_packed_available_thus_no_iteration_possible() -> crate::Result {
 #[test]
 fn packed_file_iter() -> crate::Result {
     let store = store_with_packed_refs()?;
-    assert_eq!(store.open_packed_buffer()?.expect("pack available").iter()?.count(), 9);
+    assert_eq!(store.open_packed_buffer()?.expect("pack available").iter()?.count(), 11);
     Ok(())
 }
 
@@ -264,7 +264,7 @@ fn loose_iter_with_broken_refs() -> crate::Result {
     let store = store()?;
 
     let mut actual: Vec<_> = store.loose_iter()?.collect();
-    assert_eq!(actual.len(), 19);
+    assert_eq!(actual.len(), 18);
     actual.sort_by_key(Result::is_err);
     let first_error = actual
         .iter()
@@ -273,7 +273,7 @@ fn loose_iter_with_broken_refs() -> crate::Result {
         .expect("there is an error");
 
     assert_eq!(
-        first_error, 18,
+        first_error, 17,
         "there is exactly one invalid item, and it didn't abort the iterator most importantly"
     );
     #[cfg(not(windows))]
@@ -293,18 +293,17 @@ fn loose_iter_with_broken_refs() -> crate::Result {
         ref_paths,
         vec![
             "d1",
-            "heads-loose",
             "heads/A",
             "heads/d1",
             "heads/dt1",
             "heads/main",
             "heads/multi-link-target1",
-            "heads/sub/dir/loose",
             "loop-a",
             "loop-b",
             "multi-link",
+            "prefix/feature-suffix",
+            "prefix/feature/sub/dir/algo",
             "remotes/origin/HEAD",
-            "remotes/origin/heads",
             "remotes/origin/main",
             "remotes/origin/multi-link-target3",
             "tags/dt1",
@@ -355,7 +354,6 @@ fn loose_iter_with_prefix() -> crate::Result {
             "refs/heads/dt1",
             "refs/heads/main",
             "refs/heads/multi-link-target1",
-            "refs/heads/sub/dir/loose",
         ]
         .into_iter()
         .map(String::from)
@@ -381,13 +379,11 @@ fn loose_iter_with_partial_prefix_dir() -> crate::Result {
     assert_eq!(
         actual,
         vec![
-            "refs/heads-loose",
             "refs/heads/A",
             "refs/heads/d1",
             "refs/heads/dt1",
             "refs/heads/main",
             "refs/heads/multi-link-target1",
-            "refs/heads/sub/dir/loose",
         ]
         .into_iter()
         .map(String::from)
@@ -435,14 +431,11 @@ fn overlay_iter() -> crate::Result {
     assert_eq!(
         ref_names,
         vec![
-            ("refs/heads-packed".into(), Symbolic("refs/heads/main".try_into()?),),
             (b"refs/heads/A".as_bstr().to_owned(), Object(c1)),
             (b"refs/heads/main".into(), Object(c1)),
             ("refs/heads/newer-as-loose".into(), Object(c2)),
-            (
-                "refs/heads/sub/dir/packed".into(),
-                Symbolic("refs/heads/main".try_into()?),
-            ),
+            ("refs/prefix/feature-suffix".into(), Object(c1)),
+            ("refs/prefix/feature/sub/dir/algo".into(), Object(c1)),
             (
                 "refs/remotes/origin/HEAD".into(),
                 Symbolic("refs/remotes/origin/main".try_into()?),
@@ -558,7 +551,6 @@ fn overlay_iter_with_prefix_wont_allow_absolute_paths() -> crate::Result {
 
 #[test]
 fn overlay_prefixed_iter() -> crate::Result {
-    // Test 'refs/heads/' with slash.
     use gix_ref::Target::*;
 
     let store = store_at("make_packed_ref_repository_for_overlay.sh")?;
@@ -575,58 +567,74 @@ fn overlay_prefixed_iter() -> crate::Result {
             (b"refs/heads/A".as_bstr().to_owned(), Object(c1)),
             (b"refs/heads/main".into(), Object(c1)),
             ("refs/heads/newer-as-loose".into(), Object(c2)),
-            (
-                b"refs/heads/sub/dir/packed".into(),
-                Symbolic("refs/heads/main".try_into()?)
-            ),
         ]
     );
     Ok(())
 }
 
 #[test]
-fn overlay_partial_prefix_dir_iter() -> crate::Result {
-    // Test 'refs/heads/' without slash.
+fn overlay_partial_prefix_iter() -> crate::Result {
     use gix_ref::Target::*;
 
     let store = store_at("make_packed_ref_repository_for_overlay.sh")?;
     let ref_names = store
         .iter()?
-        .prefixed(b"refs/heads".as_bstr().into())?
+        .prefixed(b"refs/heads/m".as_bstr().into())? // 'm' is partial
         .map(|r| r.map(|r| (r.name.as_bstr().to_owned(), r.target)))
         .collect::<Result<Vec<_>, _>>()?;
     let c1 = hex_to_id("134385f6d781b7e97062102c6a483440bfda2a03");
-    let c2 = hex_to_id("9902e3c3e8f0c569b4ab295ddf473e6de763e1e7");
-    assert_eq!(
-        ref_names,
-        vec![
-            (
-                b"refs/heads-packed".as_bstr().to_owned(),
-                Symbolic("refs/heads/main".try_into()?)
-            ),
-            (b"refs/heads/A".as_bstr().to_owned(), Object(c1)),
-            (b"refs/heads/main".into(), Object(c1)),
-            ("refs/heads/newer-as-loose".into(), Object(c2)),
-            (
-                b"refs/heads/sub/dir/packed".into(),
-                Symbolic("refs/heads/main".try_into()?)
-            ),
-        ]
-    );
+    assert_eq!(ref_names, vec![(b"refs/heads/main".as_bstr().to_owned(), Object(c1)),]);
     Ok(())
 }
 
 #[test]
-fn overlay_partial_prefix_iter() -> crate::Result {
+/// The prefix `refs/d` should match `refs/d1` but not `refs/heads/d1`.
+fn overlay_partial_prefix_iter_reproduce_1934() -> crate::Result {
     use gix_ref::Target::*;
 
-    let store = store_at("make_packed_ref_repository_for_overlay.sh")?;
+    let store = store_at("make_ref_repository.sh")?;
+    let c1 = hex_to_id("134385f6d781b7e97062102c6a483440bfda2a03");
+
     let ref_names = store
         .iter()?
-        .prefixed(b"refs/heads/m".as_bstr().into())? // 'm' is partial
+        .prefixed(b"refs/d".as_bstr().into())?
         .map(|r| r.map(|r| (r.name.as_bstr().to_owned(), r.target)))
         .collect::<Result<Vec<_>, _>>()?;
+    // Should not match `refs/heads/d1`.
+    assert_eq!(ref_names, vec![("refs/d1".into(), Object(c1)),]);
+    Ok(())
+}
+
+#[test]
+fn overlay_partial_prefix_iter_when_prefix_is_dir() -> crate::Result {
+    // Test 'refs/prefix/' with and without trailing slash.
+    use gix_ref::Target::*;
+
+    let store = store_at("make_packed_ref_repository_for_overlay.sh")?;
     let c1 = hex_to_id("134385f6d781b7e97062102c6a483440bfda2a03");
-    assert_eq!(ref_names, vec![(b"refs/heads/main".as_bstr().to_owned(), Object(c1)),]);
+
+    let ref_names = store
+        .iter()?
+        .prefixed(b"refs/prefix/feature".as_bstr().into())?
+        .map(|r| r.map(|r| (r.name.as_bstr().to_owned(), r.target)))
+        .collect::<Result<Vec<_>, _>>()?;
+    assert_eq!(
+        ref_names,
+        vec![
+            ("refs/prefix/feature-suffix".into(), Object(c1)),
+            ("refs/prefix/feature/sub/dir/algo".into(), Object(c1)),
+        ]
+    );
+
+    let ref_names = store
+        .iter()?
+        .prefixed(b"refs/prefix/feature/".as_bstr().into())?
+        .map(|r| r.map(|r| (r.name.as_bstr().to_owned(), r.target)))
+        .collect::<Result<Vec<_>, _>>()?;
+    assert_eq!(
+        ref_names,
+        vec![("refs/prefix/feature/sub/dir/algo".into(), Object(c1)),]
+    );
+
     Ok(())
 }

gix-ref/tests/fixtures/make_packed_ref_repository_for_overlay.sh

@@ -791,7 +791,7 @@ fn packed_refs_creation_with_packed_refs_mode_prune_removes_original_loose_refs(
 
     assert_eq!(
         edits.len(),
-        9,
+        11,
         "there are a certain amount of loose refs that are packed"
     );
 
@@ -843,7 +843,7 @@ fn packed_refs_creation_with_packed_refs_mode_leave_keeps_original_loose_refs()
         .commit(committer().to_ref())?;
     assert_eq!(
             edits.len(),
-            4,
+            2,
             "it claims to have performed all desired operations, even though some don't make it into the pack as 'side-car'"
         );
 

gix-ref/tests/fixtures/make_ref_repository.sh

@@ -18,7 +18,7 @@ fn packed_refs_with_header() -> crate::Result {
     let dir = gix_testtools::scripted_fixture_read_only_standalone("make_packed_ref_repository.sh")?;
     let buf = std::fs::read(dir.join(".git").join("packed-refs"))?;
     let iter = packed::Iter::new(&buf)?;
-    assert_eq!(iter.count(), 9, "it finds the right amount of items");
+    assert_eq!(iter.count(), 11, "it finds the right amount of items");
     Ok(())
 }