Skip to content

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

Replaces "∥" with "|" for InSync Upstream column

Maximilian Roosd299b41525a2
diff --git a/README.md b/README.md
index f1690f707..05cb167fa 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ After doing some work:
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ feature-api + ↑ +3 ↑4 ./repo.feature-api 5b01afca 30m Add API tests
-^ main ^∥ ./repo ∥ b834638e 1d Initial commit
+^ main ^| ./repo | b834638e 1d Initial commit
+ fix-auth _ ./repo.fix-auth b834638e 1d Initial commit
⚪ Showing 3 worktrees, 1 with changes, 1 ahead
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index a1df279b3..5af291b2f 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -299,7 +299,7 @@ impl ColumnKind {
variant: DiffVariant::UpstreamArrows,
positive_style: ADDITION,
negative_style: DELETION.dimmed(),
- always_show_zeros: false, // 0/0 case handled specially with ∥ symbol
+ always_show_zeros: false, // 0/0 case handled specially with | symbol
}),
_ => None,
}
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 916e0788c..1f41b6368 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -661,7 +661,7 @@ impl std::fmt::Display for UpstreamDivergence {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Self::None => Ok(()),
- Self::InSync => write!(f, "∥"),
+ Self::InSync => write!(f, "|"),
Self::Ahead => write!(f, "⇡"),
Self::Behind => write!(f, "⇣"),
Self::Diverged => write!(f, "⇅"),
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 7f5bd3206..cd031f1ea 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -610,7 +610,7 @@ impl ColumnLayout {
let Some((_, ahead, behind)) = ctx.upstream.active() else {
return StyledLine::new();
};
- // Show centered ∥ when in sync instead of ⇡0 ⇣0
+ // Show centered | when in sync instead of ⇡0 ⇣0
// Note: This duplicates the InSync check from UpstreamDivergence, but
// checking counts directly is simpler than threading the enum through.
if ahead == 0 && behind == 0 {
@@ -618,7 +618,7 @@ impl ColumnLayout {
// Center the symbol in the column width
let padding_left = (self.width.saturating_sub(1)) / 2;
cell.push_raw(" ".repeat(padding_left));
- cell.push_styled("∥", Style::new().dimmed());
+ cell.push_styled("|", Style::new().dimmed());
return cell;
}
self.render_diff_cell(ahead, behind)
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 748a9044d..6b02bab02 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ feature-api + ↑ +3 ↑4 ./repo.feature-api 5b01afca 30m Add API tests
-^ main ^∥ ./repo ∥ b834638e 1d Initial commit
+^ main ^| ./repo | b834638e 1d Initial commit
+ fix-auth _ ./repo.fix-auth b834638e 1d Initial commit
⚪ Showing 3 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index b548f6456..d5ccef659 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^∥ ./repo ∥ 6c3da842 1d Initial commit on main
+@ main ^| ./repo | 6c3da842 1d Initial commit on main
+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
-+ in-sync _ ∥ ./repo.in-sync ∥ 6c3da842 1d Initial commit on main
++ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index f1b23392d..ba03c3050 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^∥ . ∥ b834638e 1d Initial commit
+@ main ^| . | b834638e 1d Initial commit
local-only-1 _ ⎇ b834638e 1d Initial commit
local-only-2 _ ⎇ b834638e 1d Initial commit
origin/remote-only-1 _ ⎇ b834638e 1d Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index ea43d66cb..38aa130b6 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^∥ ./repo ∥ b834638e 1d Initial commit
+@ main ^| ./repo | b834638e 1d Initial commit
+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
origin/remote-only _ ⎇ b834638e 1d Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index b9f472709..7084a86d1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^∥ . ∥ b834638e 1d Initial commit
+@ main ^| . | b834638e 1d Initial commit
origin/remote-feature-1 _ ⎇ b834638e 1d Initial commit
origin/remote-feature-2 _ ⎇ b834638e 1d Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 3116792fb..108c654ca 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -27,11 +27,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^∥ ./repo ∥ 6c3da842 1d Initial commit on main
+@ main ^| ./repo | 6c3da842 1d Initial commit on main
+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 8d8f4673 1d Ahead commit 2
+ behind _ ⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
-+ in-sync _ ∥ ./repo.in-sync ∥ 6c3da842 1d Initial commit on main
++ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
⚪ Showing 6 worktrees, 2 ahead