reproduce the overlay-iterator issue causing double-refs (#1850).

GitoxideLabs · Feb 21, 2025 · f33ed88 · f33ed88
1 parent 2efce72
commit f33ed88
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-ref/tests/Cargo.toml b/gix-ref/tests/Cargo.toml
@@ -32,3 +32,4 @@ gix-hash = { path = "../../gix-hash" }
 gix-validate = { path = "../../gix-validate" }
 gix-lock = { path = "../../gix-lock" }
 gix-object = { path = "../../gix-object" }
+insta = "1.42.1"
diff --git a/gix-ref/tests/fixtures/generated-archives/make_repo_for_1850_repro.tar b/gix-ref/tests/fixtures/generated-archives/make_repo_for_1850_repro.tar
diff --git a/gix-ref/tests/fixtures/make_repo_for_1850_repro.sh b/gix-ref/tests/fixtures/make_repo_for_1850_repro.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+
+git init -q
+
+cat <<EOF >.git/packed-refs
+# pack-refs with: peeled fully-peeled sorted
+17dad46c0ce3be4d4b6d45def031437ab2e40666 refs/heads/ig-branch-remote
+83a70366fcc1255d35a00102138293bac673b331 refs/heads/ig-inttest
+21b57230833a1733f6685e14eabe936a09689a1b refs/heads/ig-pr4021
+d773228d0ee0012fcca53fffe581b0fce0b1dc56 refs/heads/ig/aliases
+ba37abe04f91fec76a6b9a817d40ee2daec47207 refs/heads/ig/cifail
+EOF
+
+mkdir -p .git/refs/heads/ig/pr
+echo d22f46f3d7d2504d56c573b5fe54919bd16be48a >.git/refs/heads/ig/push-name
+echo 4dec145966c546402c5a9e28b932e7c8c939e01e >.git/refs/heads/ig-pr4021
diff --git a/gix-ref/tests/refs/file/store/iter.rs b/gix-ref/tests/refs/file/store/iter.rs
@@ -413,6 +413,57 @@ fn overlay_iter() -> crate::Result {
     Ok(())
 }
 
+#[test]
+fn overlay_iter_reproduce_1850() -> crate::Result {
+    let store = store_at("make_repo_for_1850_repro.sh")?;
+    let ref_names = store
+        .iter()?
+        .all()?
+        .map(|r| r.map(|r| (r.name.as_bstr().to_owned(), r.target)))
+        .collect::<Result<Vec<_>, _>>()?;
+    insta::assert_debug_snapshot!(ref_names, @r#"
+    [
+        (
+            "refs/heads/ig-branch-remote",
+            Object(
+                Sha1(17dad46c0ce3be4d4b6d45def031437ab2e40666),
+            ),
+        ),
+        (
+            "refs/heads/ig-inttest",
+            Object(
+                Sha1(83a70366fcc1255d35a00102138293bac673b331),
+            ),
+        ),
+        (
+            "refs/heads/ig/aliases",
+            Object(
+                Sha1(d773228d0ee0012fcca53fffe581b0fce0b1dc56),
+            ),
+        ),
+        (
+            "refs/heads/ig/cifail",
+            Object(
+                Sha1(ba37abe04f91fec76a6b9a817d40ee2daec47207),
+            ),
+        ),
+        (
+            "refs/heads/ig/push-name",
+            Object(
+                Sha1(d22f46f3d7d2504d56c573b5fe54919bd16be48a),
+            ),
+        ),
+        (
+            "refs/heads/ig-pr4021",
+            Object(
+                Sha1(4dec145966c546402c5a9e28b932e7c8c939e01e),
+            ),
+        ),
+    ]
+    "#);
+    Ok(())
+}
+
 #[test]
 fn overlay_iter_with_prefix_wont_allow_absolute_paths() -> crate::Result {
     let store = store_with_packed_refs()?;