Skip to content

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

style: Dim status arrows in wt list output

Claudeed67d2b76ecf
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 3096f7722..a15207945 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -558,7 +558,7 @@ impl StatusSymbols {
/// column position across all rows, while minimizing wasted space.
pub fn render_with_mask(&self, mask: &PositionMask) -> String {
use unicode_width::UnicodeWidthStr;
- use worktrunk::styling::{CYAN, ERROR, HINT, WARNING};
+ use worktrunk::styling::{CYAN, ERROR, GRAY, HINT, WARNING};
let mut result = String::with_capacity(12);
@@ -585,8 +585,16 @@ impl StatusSymbols {
} else {
String::new()
};
- let main_divergence_str = self.main_divergence.to_string();
- let upstream_divergence_str = self.upstream_divergence.to_string();
+ let main_divergence_str = if self.main_divergence != MainDivergence::None {
+ format!("{GRAY}{}{GRAY:#}", self.main_divergence)
+ } else {
+ String::new()
+ };
+ let upstream_divergence_str = if self.upstream_divergence != UpstreamDivergence::None {
+ format!("{GRAY}{}{GRAY:#}", self.upstream_divergence)
+ } else {
+ String::new()
+ };
let working_tree_str = if !self.working_tree.is_empty() {
format!("{CYAN}{}{CYAN:#}", self.working_tree)
} else {
diff --git a/src/styling/constants.rs b/src/styling/constants.rs
index 792803436..cb36489b0 100644
--- a/src/styling/constants.rs
+++ b/src/styling/constants.rs
@@ -57,6 +57,9 @@ pub const GREEN_BOLD: Style = Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Green)))
.bold();
+/// Gray style for status arrows (divergence indicators) - use as `{GRAY}text{GRAY:#}`
+pub const GRAY: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
+
// ============================================================================
// Message Emojis
// ============================================================================
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index 7a998bd94..617293aa1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -3,13 +3,13 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
-
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
  echo 'test command'
💡 Allow and remember? [y/N]
+
🔄 Running post-create:
  echo 'test command'
test command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 8aca362b5..f07215dd7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -3,13 +3,13 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
n
-
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
  echo 'test command'
💡 Allow and remember? [y/N]
+
⚪ Commands declined, continuing worktree creation
✅ Created new worktree for test-decline from main at [REPO]/test-repo.test-decline
💡 To enable automatic cd, run: wt config shell
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 9be8f95a0..9e794fde2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -3,7 +3,6 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
-
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
@@ -13,6 +12,7 @@ y
  echo 'Third command'
💡 Allow and remember? [y/N]
+
🔄 Running post-create:
  echo 'First command'
First command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 3f4b7eaf4..1306251b5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -3,7 +3,6 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
n
-
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
@@ -13,6 +12,7 @@ n
  echo 'Third command'
💡 Allow and remember? [y/N]
+
⚪ Commands declined, continuing worktree creation
✅ Created new worktree for test-mixed-decline from main at [REPO]/test-repo.test-mixed-decline
💡 To enable automatic cd, run: wt config shell
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index ad9c09961..8a8154193 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -3,7 +3,6 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
-
🟡 test-repo needs approval to execute 3 commands:
🔄 post-create:
@@ -16,6 +15,7 @@ y
  echo 'Third command'
💡 Allow and remember? [y/N]
+
🔄 Running post-create:
  echo 'First command'
First command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index fcf7362ca..ab262fbfa 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -3,7 +3,6 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
-
🟡 test-repo needs approval to execute 3 commands:
🔄 post-create install:
@@ -16,6 +15,7 @@ y
  echo 'Running tests...'
💡 Allow and remember? [y/N]
+
🔄 Running post-create install:
  echo 'Installing dependencies...'
Installing dependencies...
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 06014ea67..51601c869 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpI9FtJQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpttuwMc/test-config.toml
---
success: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10 months ago Diverged commit
-feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10 months ago Add 100 lines
+diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10 months ago Diverged commit
+feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10 months ago Add 100 lines
fix ? ≡ 💬 ./fix b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index f6a56e317..4f7b37b37 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPVlyPb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmphCyfIl/test-config.toml
---
success: true
exit_code: 0
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 875d78f7e..4af5f3472 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO4JnM9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpbvoSm5/test-config.toml
---
success: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 1310bfb9 10 months ago Short message
-feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should…
+feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 2a80c64bc..c06dc02f8 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -12,10 +12,11 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoGHFYx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmp6dTNgv/test-config.toml
---
success: true
exit_code: 0
@@ -23,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-main ⇡ ./test-repo ↑1 ↓0 85ed6d3d 10 months ago Main advances
-feature ?!+»✘= ↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10 months ago Local commit
+main ⇡ ./test-repo ↑1 ↓0 85ed6d3d 10 months ago Main advances
+feature ?!+»✘= ↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10 months ago Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index e748372a2..7eb8d2b6d 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQIhBES/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpPZfIth/test-config.toml
---
success: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10 months ago Add files
+feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10 months ago Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
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 4c1c0e07c..3f38cc0a8 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
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXN0aAS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpi9z7AG/test-config.toml
---
success: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo ↑0 ↓0 b834638e 10 months ago Initial commit
-bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10 months ago Fix bug
-feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10 months ago Add file 3
+bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10 months ago Fix bug
+feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10 months ago Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 1e531c4cb..e70a72860 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnstGyk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpwI22Ln/test-config.toml
---
success: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10 months ago Symbol commit
-pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10 months ago PR commit
-wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10 months ago Initial content
+main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10 months ago Symbol commit
+pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10 months ago PR commit
+wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10 months ago Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 3852bd2db..1943a517f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqSD520/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmp4OSwfX/test-config.toml
---
success: true
exit_code: 0
@@ -27,6 +27,6 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
feature-a ? ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10 months ago Test commit
+feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10 months ago Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index 0652003c1..b56005fbf 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu19sav/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpHLs5YC/test-config.toml
---
success: true
exit_code: 0
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
⚪ Showing 5 worktrees, 4 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 8248004ec..fab3df5f4 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfQLfw5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpsCn7HA/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10 months ago Ahead commit
+ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10 months ago Ahead commit
in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index d7e5ad4d5..ce7b91022 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjeVWna/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpeC20qE/test-config.toml
---
success: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
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 bbc00ee23..a4c4f63ed 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwVmPMD/mock-bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/tmp/.tmpnjjxec/mock-bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwVmPMD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpnjjxec/test-config.toml
---
success: true
exit_code: 0
@@ -27,9 +27,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10 months ago Initial commit on main
-diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
+ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
+behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index dab8dd60b..ddf84ea30 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVF2rIO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /tmp/.tmpYJPBXb/test-config.toml
---
success: false
exit_code: 1
@@ -29,8 +29,7 @@ exit_code: 1
  hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
  hint: You can instead skip this commit: run "git rebase --skip".
  hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-  hint: Disable this message with "git config set advice.mergeConflict false"
-  Could not apply [SHA]... # Update shared.txt in feature
+  Could not apply [SHA]... Update shared.txt in feature
----- stderr -----