Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix tree comparison for branches without worktrees
Maximilian Roos57210d691667
diff --git a/docs/content/list.md b/docs/content/list.mdindex 2f7f0a0c8..4eaecbc52 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -56,8 +56,8 @@ Include branches that don't have worktrees:@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>- <span class=d>exp</span> <span class=d>⊂</span><span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>- <span class=d>wip</span> <span class=d>⊂</span><span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>+ exp <span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>+ wip <span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>{% end %}diff --git a/src/commands/list/collect_progressive_impl.rs b/src/commands/list/collect_progressive_impl.rsindex cfca6c288..528a5c670 100644--- a/src/commands/list/collect_progressive_impl.rs+++ b/src/commands/list/collect_progressive_impl.rs@@ -188,7 +188,7 @@ impl Task for AheadBehindTask {}}-/// Task 3: Tree identity check (does HEAD tree match default branch's tree?)+/// Task 3: Tree identity check (does the item's commit tree match default branch's tree?)pub struct CommittedTreesMatchTask;impl Task for CommittedTreesMatchTask {@@ -197,7 +197,9 @@ impl Task for CommittedTreesMatchTask {fn compute(ctx: TaskContext) -> TaskResult {let committed_trees_match = if let Some(base) = ctx.default_branch.as_deref() {let repo = Repository::at(&ctx.repo_path);- repo.head_tree_matches_branch(base).unwrap_or(false)+ // Use ctx.commit_sha (the item's commit) instead of HEAD,+ // since for branches without worktrees, HEAD is the main worktree's HEAD+ repo.trees_match(&ctx.commit_sha, base).unwrap_or(false)} else {false};diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snapindex 4492cfd08..bb6880ab6 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap@@ -28,7 +28,7 @@ exit_code: 0@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2m28d38c20[0m [2m30m[0m^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m2e6b7a8f[0m [2m4d[0m+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m1d697d5b[0m [2m5h[0m- [2mexp[0m [2m⊂[22m[2m↕[22m [2m/[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m32936618[0m [2m2d[0m- [2mwip[0m [2m⊂[22m[2m↕[22m [2m/[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2m6844b101[0m [2m3d[0m+ exp [2m↕[22m [2m/[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m32936618[0m [2m2d[0m+ wip [2m↕[22m [2m/[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2m6844b101[0m [2m3d[0m⚪ [2mShowing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden[0m