From c1c57ff7d0bcb28c5fbb910cbc2aa3545d22d6ff Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Sun, 20 Sep 2026 07:27:12 +0000 Subject: [PATCH 1/2] test(query): build the census token kind as a Cow #1881 changed ConservativeCloneTokenV1::syntax_kind to Cow<'static, str> and #1882 added a census test that builds it from a String. Each was green on its own branch; master's push run after each merge was cancelled by the next merge, so the union first compiled on master and failed the clippy, feature-gates and core-storage jobs with E0308. Co-Authored-By: Claude Fable 5.1 --- .../src/retrieval/lexical/projection/artifact/clone_census.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/clone_census.rs b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/clone_census.rs index 967872c365..6afb139f0f 100644 --- a/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/clone_census.rs +++ b/crates/tracedecay-query/src/retrieval/lexical/projection/artifact/clone_census.rs @@ -264,7 +264,7 @@ mod tests { conservative_tokens: Arc::from( (0..8) .map(|index| ConservativeCloneTokenV1::Syntax { - syntax_kind: "identifier".to_owned(), + syntax_kind: "identifier".into(), text: format!("token_{seed}_{index}"), }) .collect::>(), From 8c5c64b1c70c765271cb9d8cec74fd488c6ac996 Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Sun, 20 Sep 2026 07:17:49 +0000 Subject: [PATCH 2/2] test(sessions): keep git auto-maintenance out of the fixture Git 2.47+ detaches maintenance after a commit and holds .git/objects/maintenance.lock while it runs. The read-only capture test fingerprints the git dir before and after two captures, so a lock that appears in the first snapshot and is gone by the second reads as the capture having touched the object store. The fixture now disables auto maintenance and gc for every git call, as the runtime-core fixture does. Co-Authored-By: Claude Fable 5.1 --- .../tracedecay-sessions/src/repository_provenance_test.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/tracedecay-sessions/src/repository_provenance_test.rs b/crates/tracedecay-sessions/src/repository_provenance_test.rs index d888e4eb4d..d03c1359f6 100644 --- a/crates/tracedecay-sessions/src/repository_provenance_test.rs +++ b/crates/tracedecay-sessions/src/repository_provenance_test.rs @@ -31,6 +31,12 @@ impl GitFixture { tracedecay_runtime_core::git::try_git_program() .expect("absolute git executable should resolve"), ) + // Git 2.47+ detaches `maintenance run --auto` after a commit and holds + // `.git/objects/maintenance.lock` while it runs, which lands in one + // git-dir fingerprint and vanishes before the next. The read-only + // capture test compares those fingerprints, so the fixture must not + // write either. + .args(["-c", "maintenance.auto=false", "-c", "gc.auto=0"]) .args(args) .current_dir(self.path()) .output()