Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

chore: clippy sort_by_key and stabilize thread ID in snapshot (#1808)

Axel H.4311102adabc
diff --git a/src/git/repository/branches.rs b/src/git/repository/branches.rs
index 2d69d197f..6cd19925e 100644
--- a/src/git/repository/branches.rs
+++ b/src/git/repository/branches.rs
@@ -230,7 +230,7 @@ impl Repository {
(name, remotes, timestamp)
})
.collect();
- remote_branches.sort_by(|a, b| b.2.cmp(&a.2));
+ remote_branches.sort_by_key(|b| std::cmp::Reverse(b.2));
// Build result: worktrees first, then local, then remote
let mut result = Vec::new();
diff --git a/tests/integration_tests/hook_show.rs b/tests/integration_tests/hook_show.rs
index 60ed09fef..537390c8d 100644
--- a/tests/integration_tests/hook_show.rs
+++ b/tests/integration_tests/hook_show.rs
@@ -299,6 +299,8 @@ lint = "pre-commit run"
let canonical_home = crate::common::canonicalize(temp_home.path())
.unwrap_or_else(|_| temp_home.path().to_path_buf());
settings.add_filter(&regex::escape(&canonical_home.to_string_lossy()), "~");
+ // Normalize thread IDs in panic messages (e.g., "thread 'main' (1234567)")
+ settings.add_filter(r"thread '([^']+)' \(\d+\)", "thread '$1' ([THREAD_ID])");
settings.bind(|| {
let mut cmd = wt_command();
cmd.arg("hook").arg("show").current_dir(temp_dir.path());