Skip to content

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.md
index 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.rs
index 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.snap
index 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
@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
- exp ⊂↕ / ↑2 ↓1 +137 32936618 2d
- wip ⊂↕ / ↑1 ↓1 +33 6844b101 3d
+ exp ↕ / ↑2 ↓1 +137 32936618 2d
+ wip ↕ / ↑1 ↓1 +33 6844b101 3d
⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden