Skip to content

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

Refactor: Use underscore for "No commits" symbol

Maximilian Roos2f9dacf45f0d
diff --git a/README.md b/README.md
index e38ab3175..795221912 100644
--- a/README.md
+++ b/README.md
@@ -716,7 +716,7 @@ Options:
## Status Symbols
-Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
+Order: `+!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `+` Staged files (ready to commit)
- `!` Modified files (unstaged changes)
@@ -724,7 +724,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)
- `⚠` **Would conflict** - merging into main would fail
- `≡` Working tree matches main (identical contents, regardless of commit history)
-- `∅` No commits (no commits ahead AND no uncommitted changes)
+- `_` No commits (no commits ahead AND no uncommitted changes)
- `↻` Rebase in progress
- `⋈` Merge in progress
- `↑` Ahead of main branch
@@ -737,7 +737,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `⌫` Prunable worktree (directory missing, can be pruned)
- `⊠` Locked worktree (protected from auto-removal)
-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*
+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*
## JSON Output
@@ -933,10 +933,10 @@ git config worktrunk.status.feature-x "💬"
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo f0879504 1d Initial commit
-+ clean-no-status ∅ ./repo.clean-no-status f0879504 1d Initial commit
-+ clean-with-status ∅ 💬 ./repo.clean-with-status f0879504 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status f0879504 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status f0879504 1d Initial commit
+ dirty-no-status ! +1 -1 ./repo.dirty-no-status f0879504 1d Initial commit
-+ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
@@ -962,10 +962,10 @@ When using Claude:
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo f0879504 1d Initial commit
-+ clean-no-status ∅ ./repo.clean-no-status f0879504 1d Initial commit
-+ clean-with-status ∅ 💬 ./repo.clean-with-status f0879504 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status f0879504 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status f0879504 1d Initial commit
+ dirty-no-status ! +1 -1 ./repo.dirty-no-status f0879504 1d Initial commit
-+ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
diff --git a/src/cli.rs b/src/cli.rs
index 721fdafbc..36f9e3466 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -611,7 +611,7 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>
## Status Symbols
-Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
+Order: `+!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `+` Staged files (ready to commit)
- `!` Modified files (unstaged changes)
@@ -619,7 +619,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)
- `⚠` **Would conflict** - merging into main would fail
- `≡` Working tree matches main (identical contents, regardless of commit history)
-- `∅` No commits (no commits ahead AND no uncommitted changes)
+- `_` No commits (no commits ahead AND no uncommitted changes)
- `↻` Rebase in progress
- `⋈` Merge in progress
- `↑` Ahead of main branch
@@ -632,7 +632,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `⌫` Prunable worktree (directory missing, can be pruned)
- `⊠` Locked worktree (protected from auto-removal)
-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*
+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*
## JSON Output
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index f68bc918e..afa7da670 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -720,7 +720,7 @@ impl serde::Serialize for WorktreeState {
/// 3. Merge (⋈) - active operation
/// 4. MergeTreeConflicts (⚠) - potential problem
/// 5. MatchesMain (≡) - removable
-/// 6. NoCommits (∅) - removable
+/// 6. NoCommits (_) - removable
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]
pub enum BranchOpState {
#[strum(serialize = "")]
@@ -750,7 +750,7 @@ impl std::fmt::Display for BranchOpState {
Self::Merge => write!(f, "⋈"),
Self::MergeTreeConflicts => write!(f, "⚠"),
Self::MatchesMain => write!(f, "≡"),
- Self::NoCommits => write!(f, "∅"),
+ Self::NoCommits => write!(f, "_"),
}
}
}
@@ -819,7 +819,7 @@ impl PositionMask {
1, // STAGED: + (1 char)
1, // MODIFIED: ! (1 char)
1, // UNTRACKED: ? (1 char)
- 1, // BRANCH_OP_STATE: ✖↻⋈⚠≡∅ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)
+ 1, // BRANCH_OP_STATE: ✖↻⋈⚠≡_ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)
1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)
1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)
1, // WORKTREE_STATE: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
@@ -837,7 +837,7 @@ impl PositionMask {
///
/// Symbols are categorized to enable vertical alignment in table output:
/// - Working tree: +, !, ? (staged, modified, untracked - priority order)
-/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, ∅ (combined position with priority)
+/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, _ (combined position with priority)
/// - Main divergence: ^, ↑, ↓, ↕
/// - Upstream divergence: ⇡, ⇣, ⇅
/// - Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority-only)
@@ -846,13 +846,13 @@ impl PositionMask {
/// ## Mutual Exclusivity
///
/// **Combined with priority (branch state + git operation):**
-/// Priority: ✖ > ↻ > ⋈ > ⚠ > ≡ > ∅
+/// Priority: ✖ > ↻ > ⋈ > ⚠ > ≡ > _
/// - ✖: Actual conflicts (must resolve)
/// - ↻: Rebase in progress
/// - ⋈: Merge in progress
/// - ⚠: Merge-tree conflicts (potential problem)
/// - ≡: Matches main (removable)
-/// - ∅: No commits (removable)
+/// - _: No commits (removable)
///
/// **Mutually exclusive (enforced by type system):**
/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
@@ -867,7 +867,7 @@ impl PositionMask {
#[derive(Debug, Clone, Default)]
pub struct StatusSymbols {
/// Combined branch and operation state (mutually exclusive with priority)
- /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (∅)
+ /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (_)
pub(crate) branch_op_state: BranchOpState,
/// Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
diff --git a/src/md_help.rs b/src/md_help.rs
index d0652cc92..131f34f35 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -122,7 +122,7 @@ fn colorize_status_symbols(text: &str) -> String {
"≡ Working tree matches",
&format!("{hint}≡{hint:#} Working tree matches"),
)
- .replace("∅ No commits", &format!("{hint}∅{hint:#} No commits"))
+ .replace("_ No commits", &format!("{hint}_{hint:#} No commits"))
.replace(
"· Branch without",
&format!("{hint}·{hint:#} Branch without"),
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index cd7ea4d7b..2d01c80d9 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -197,12 +197,18 @@ complete --keep-order --exclusive --command wt --arguments "(COMPLETE=fish \$WOR
/// Quote a shell argument if it contains special characters
fn quote_arg(arg: &str) -> String {
if arg.contains(' ') || arg.contains(';') || arg.contains('\'') {
- format!("'{}'", arg.replace('\'', "'\\''"))
+ shell_quote(arg)
} else {
arg.to_string()
}
}
+/// Always quote a string for shell use, properly escaping single quotes.
+/// Handles paths like `/path/to/worktrunk.'∅'/target/debug/wt`
+fn shell_quote(s: &str) -> String {
+ format!("'{}'", s.replace('\'', "'\\''"))
+}
+
/// Build a shell script that sources the wrapper and runs a command
fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&str]) -> String {
let wt_bin = get_cargo_bin("wt");
@@ -213,12 +219,16 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s
// Don't use 'set -e' in bash/zsh - we want to capture failures and their exit codes.
// This is tested by test_wrapper_handles_command_failure which verifies
// that command failures return proper exit codes rather than aborting the script.
+ // Properly quote paths to handle special characters like single quotes
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_path_quoted = shell_quote(&repo.test_config_path().display().to_string());
+
match shell {
"fish" => {
- script.push_str(&format!("set -x WORKTRUNK_BIN '{}'\n", wt_bin.display()));
+ script.push_str(&format!("set -x WORKTRUNK_BIN {}\n", wt_bin_quoted));
script.push_str(&format!(
- "set -x WORKTRUNK_CONFIG_PATH '{}'\n",
- repo.test_config_path().display()
+ "set -x WORKTRUNK_CONFIG_PATH {}\n",
+ config_path_quoted
));
script.push_str("set -x CLICOLOR_FORCE 1\n");
}
@@ -229,19 +239,19 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s
// but compinit is safe since it only sets up completion functions
script.push_str("autoload -Uz compinit && compinit -i 2>/dev/null\n");
- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));
+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));
script.push_str(&format!(
- "export WORKTRUNK_CONFIG_PATH='{}'\n",
- repo.test_config_path().display()
+ "export WORKTRUNK_CONFIG_PATH={}\n",
+ config_path_quoted
));
script.push_str("export CLICOLOR_FORCE=1\n");
}
_ => {
// bash
- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));
+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));
script.push_str(&format!(
- "export WORKTRUNK_CONFIG_PATH='{}'\n",
- repo.test_config_path().display()
+ "export WORKTRUNK_CONFIG_PATH={}\n",
+ config_path_quoted
));
script.push_str("export CLICOLOR_FORCE=1\n");
}
@@ -1087,9 +1097,18 @@ approved-commands = [
repo.commit("Initial commit");
repo.setup_remote("main");
- // Get path to the test fixture script
+ // Copy the fixture script to the test repo to avoid path issues with special characters
+ // (CARGO_MANIFEST_DIR may contain single quotes like worktrunk.'∅' which break shell parsing)
let fixtures_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");
- let script_path = fixtures_dir.join("mixed-output.sh");
+ let script_content = fs::read(&fixtures_dir.join("mixed-output.sh")).unwrap();
+ let script_path = repo.root_path().join("mixed-output.sh");
+ fs::write(&script_path, &script_content).unwrap();
+ // Make the script executable
+ #[cfg(unix)]
+ {
+ use std::os::unix::fs::PermissionsExt;
+ fs::set_permissions(&script_path, fs::Permissions::from_mode(0o755)).unwrap();
+ }
// Create project config with pre-merge commands that output to both stdout and stderr
let config_dir = repo.root_path().join(".config");
@@ -1506,32 +1525,25 @@ approved-commands = ["echo 'fish background task'"]
let wrapper_script = generate_wrapper(&repo, shell);
let mut script = String::new();
- // Set environment variables
+ // Set environment variables (use shell_quote to handle paths with special chars)
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
match shell {
"fish" => {
- script.push_str(&format!("set -x WORKTRUNK_BIN '{}'\n", wt_bin.display()));
- script.push_str(&format!(
- "set -x WORKTRUNK_CONFIG_PATH '{}'\n",
- repo.test_config_path().display()
- ));
+ script.push_str(&format!("set -x WORKTRUNK_BIN {}\n", wt_bin_quoted));
+ script.push_str(&format!("set -x WORKTRUNK_CONFIG_PATH {}\n", config_quoted));
script.push_str("set -x CLICOLOR_FORCE 1\n");
}
"zsh" => {
script.push_str("autoload -Uz compinit && compinit -i 2>/dev/null\n");
- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));
- script.push_str(&format!(
- "export WORKTRUNK_CONFIG_PATH='{}'\n",
- repo.test_config_path().display()
- ));
+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));
+ script.push_str(&format!("export WORKTRUNK_CONFIG_PATH={}\n", config_quoted));
script.push_str("export CLICOLOR_FORCE=1\n");
}
_ => {
// bash
- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));
- script.push_str(&format!(
- "export WORKTRUNK_CONFIG_PATH='{}'\n",
- repo.test_config_path().display()
- ));
+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));
+ script.push_str(&format!("export WORKTRUNK_CONFIG_PATH={}\n", config_quoted));
script.push_str("export CLICOLOR_FORCE=1\n");
}
}
@@ -1694,14 +1706,14 @@ approved-commands = ["echo 'bash background'"]
// Build the setup script that defines the wt function
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, "bash");
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
let setup_script = format!(
- "export WORKTRUNK_BIN='{}'\n\
- export WORKTRUNK_CONFIG_PATH='{}'\n\
+ "export WORKTRUNK_BIN={}\n\
+ export WORKTRUNK_CONFIG_PATH={}\n\
export CLICOLOR_FORCE=1\n\
{}",
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
);
let config_path = repo.test_config_path().to_string_lossy().to_string();
@@ -1759,17 +1771,17 @@ approved-commands = ["echo 'bash background'"]
// Script that sources wrapper and checks if completion is registered
// (completions are inline in the wrapper via lazy loading)
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
let script = format!(
r#"
- export WORKTRUNK_BIN='{}'
- export WORKTRUNK_CONFIG_PATH='{}'
+ export WORKTRUNK_BIN={}
+ export WORKTRUNK_CONFIG_PATH={}
{}
# Check if wt completion is registered
complete -p wt 2>/dev/null && echo "__COMPLETION_REGISTERED__" || echo "__NO_COMPLETION__"
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
);
let final_script = format!("( {} ) 2>&1", script);
@@ -1799,10 +1811,12 @@ approved-commands = ["echo 'bash background'"]
let completions_script = generate_completions(&repo, "fish");
// Script that sources wrapper, completions, and checks if completion is registered
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
let script = format!(
r#"
- set -x WORKTRUNK_BIN '{}'
- set -x WORKTRUNK_CONFIG_PATH '{}'
+ set -x WORKTRUNK_BIN {}
+ set -x WORKTRUNK_CONFIG_PATH {}
{}
{}
# Check if wt completions are registered
@@ -1812,10 +1826,7 @@ approved-commands = ["echo 'bash background'"]
echo "__NO_COMPLETION__"
end
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script,
- completions_script
+ wt_bin_quoted, config_quoted, wrapper_script, completions_script
);
let final_script = format!("begin\n{}\nend 2>&1", script);
@@ -1845,10 +1856,12 @@ approved-commands = ["echo 'bash background'"]
let wrapper_script = generate_wrapper(&repo, "zsh");
// Script that sources wrapper and checks if wt function exists
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
let script = format!(
r#"
- export WORKTRUNK_BIN='{}'
- export WORKTRUNK_CONFIG_PATH='{}'
+ export WORKTRUNK_BIN={}
+ export WORKTRUNK_CONFIG_PATH={}
{}
# Check if wt wrapper function is defined
if (( $+functions[wt] )); then
@@ -1857,9 +1870,7 @@ approved-commands = ["echo 'bash background'"]
echo "__NO_WRAPPER__"
fi
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
);
let final_script = format!("( {} ) 2>&1", script);
@@ -1945,6 +1956,10 @@ approved-commands = ["echo 'bash background'"]
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, shell);
+ // Use shell_quote to handle paths with special chars (like single quotes)
+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());
+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());
+
// Script that explicitly removes wt from PATH but sets WORKTRUNK_BIN
let script = match shell {
"zsh" => format!(
@@ -1952,46 +1967,40 @@ approved-commands = ["echo 'bash background'"]
autoload -Uz compinit && compinit -i 2>/dev/null
# Clear PATH to ensure wt is not found via PATH
export PATH="/usr/bin:/bin"
- export WORKTRUNK_BIN='{}'
- export WORKTRUNK_CONFIG_PATH='{}'
+ export WORKTRUNK_BIN={}
+ export WORKTRUNK_CONFIG_PATH={}
export CLICOLOR_FORCE=1
{}
wt switch --create fallback-test
echo "__PWD__ $PWD"
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
),
"fish" => format!(
r#"
# Clear PATH to ensure wt is not found via PATH
set -x PATH /usr/bin /bin
- set -x WORKTRUNK_BIN '{}'
- set -x WORKTRUNK_CONFIG_PATH '{}'
+ set -x WORKTRUNK_BIN {}
+ set -x WORKTRUNK_CONFIG_PATH {}
set -x CLICOLOR_FORCE 1
{}
wt switch --create fallback-test
echo "__PWD__ $PWD"
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
),
_ => format!(
r#"
# Clear PATH to ensure wt is not found via PATH
export PATH="/usr/bin:/bin"
- export WORKTRUNK_BIN='{}'
- export WORKTRUNK_CONFIG_PATH='{}'
+ export WORKTRUNK_BIN={}
+ export WORKTRUNK_CONFIG_PATH={}
export CLICOLOR_FORCE=1
{}
wt switch --create fallback-test
echo "__PWD__ $PWD"
"#,
- wt_bin.display(),
- repo.test_config_path().display(),
- wrapper_script
+ wt_bin_quoted, config_quoted, wrapper_script
),
};
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
index e7824ef98..b753efab4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
@@ -5,8 +5,8 @@ expression: normalized
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
> @ main ^ ./repo ..│
- + feature-one ∅ ./repo.fea..│⚪ No uncommitted changes
- + feature-two ∅ ./repo.fea..│
+ + feature-one _ ./repo.fea..│⚪ No uncommitted changes
+ + feature-two _ ./repo.fea..│
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
index b91dfe581..48752acba 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
@@ -5,8 +5,8 @@ expression: normalized
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path │ctrl-u/d: scroll
> @ main ^ ./repo │
- + active-worktree ∅ ./repo..│⚪ No uncommitted changes
- orphan-branch ∅ ⎇ │
+ + active-worktree _ ./repo..│⚪ No uncommitted changes
+ orphan-branch _ ⎇ │
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 6e385ff83..84638fef0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
🔄 Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 6e385ff83..84638fef0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
🔄 Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snap
index d7c79911a..ab0fac1ff 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap
@@ -76,7 +76,7 @@ Global Options:
Status Symbols
-Order: +!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠
+Order: +!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠
- + Staged files (ready to commit)
- ! Modified files (unstaged changes)
@@ -84,7 +84,7 @@ Order: +!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠
- ✖ Merge conflicts - unresolved conflicts in working tree (fix before continuing)
- ⚠ Would conflict - merging into main would fail
- ≡ Working tree matches main (identical contents, regardless of commit history)
-- ∅ No commits (no commits ahead AND no uncommitted changes)
+- _ No commits (no commits ahead AND no uncommitted changes)
- ↻ Rebase in progress
- ⋈ Merge in progress
- ↑ Ahead of main branch
@@ -97,7 +97,7 @@ Order: +!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠
- ⌫ Prunable worktree (directory missing, can be pruned)
- ⊠ Locked worktree (protected from auto-removal)
-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*
+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*
JSON Output
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 9845158ae..97e8363da 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 10mo Initial commit
- branch-only ∅ ⎇ b834638e 10mo Initial commit
+ branch-only _ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index 501b4c4d6..6f49c2437 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ - ∅ ⚐ ./repo.feature b834638e 10mo Initial commit
++ - _ ⚐ ./repo.feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index 4c710793b..36f18ac69 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -156,13 +156,13 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "∅",
+ "branch_op_state": "_",
"main_divergence": "↓",
"upstream_divergence": "",
"worktree_state": ""
},
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
- "status_line": "feature-behind /u001b[2m∅/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "status_line": "feature-behind /u001b[2m_/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-behind",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index d51b189a0..eaeeeae44 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -105,12 +105,12 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "∅",
+ "branch_op_state": "_",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "feature-detached /u001b[2m∅/u001b[0m",
+ "status_line": "feature-detached /u001b[2m_/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-detached",
"bare": false,
@@ -156,12 +156,12 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "∅",
+ "branch_op_state": "_",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "⊠"
},
- "status_line": "locked-feature /u001b[2m∅/u001b[0m/u001b[33m⊠/u001b[0m",
+ "status_line": "locked-feature /u001b[2m_/u001b[0m/u001b[33m⊠/u001b[0m",
"type": "worktree",
"path": "[REPO].locked-feature",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
index 4ef4901dd..023541c25 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
@@ -106,13 +106,13 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "∅",
+ "branch_op_state": "_",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "",
"user_status": "🔧"
},
- "status_line": "with-status /u001b[2m∅/u001b[0m🔧",
+ "status_line": "with-status /u001b[2m_/u001b[0m🔧",
"type": "worktree",
"path": "[REPO].with-status",
"bare": false,
@@ -158,12 +158,12 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "∅",
+ "branch_op_state": "_",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "without-status /u001b[2m∅/u001b[0m",
+ "status_line": "without-status /u001b[2m_/u001b[0m",
"type": "worktree",
"path": "[REPO].without-status",
"bare": false,
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 a90b1d3fa..3fd143a47 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -27,6 +27,6 @@ exit_code: 0
@ main ^ ./repo b834638e 10mo Initial commit
+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 10mo Diverged commit
+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 10mo Add 100 lines
-+ fix ?∅ 💬 ./repo.fix b834638e 10mo Initial commit
++ fix ?_ 💬 ./repo.fix b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 2c00cee8c..5d43961e1 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ develop ^ ⚐ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 2c0779921..e2b1e03bc 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -19,8 +19,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
+@ main ^ ./repo b834638e 11mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 11mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 11mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index f9e481fb6..72d8ed99f 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ locked-no-reason ∅ ⊠ ./repo.locked-no-reason b834638e 10mo Initial commit
++ locked-no-reason _ ⊠ ./repo.locked-no-reason b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index d52c52b1a..54e67fca3 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ locked-feature ∅ ⊠ ./repo.locked-feature b834638e 10mo Initial commit
++ locked-feature _ ⊠ ./repo.locked-feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
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 a49d3e915..fd5bb9d98 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo 1310bfb9 10mo Short message
-+ feature-a ∅↓ ↓1 ./repo.feature-a f078644e 10mo This is a very long commit message that should test how the…
++ feature-a _↓ ↓1 ./repo.feature-a f078644e 10mo This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 0764f8540..ea52cbf8e 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ medium-name ∅ ./repo.medium-name b834638e 10mo Initial commit
-+ short ∅ ./repo.short b834638e 10mo Initial commit
-+ very-long-branch-name-here ∅ ./repo.very-long-branch-name-here b834638e 10mo Initial commit
-+ with-changes ∅ ./repo.with-changes b834638e 10mo Initial commit
++ medium-name _ ./repo.medium-name b834638e 10mo Initial commit
++ short _ ./repo.short b834638e 10mo Initial commit
++ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 10mo Initial commit
++ with-changes _ ./repo.with-changes b834638e 10mo Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 698f17ec9..1dfe50886 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index 8fff02b8a..35214db99 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature ∅ ./repo.feature b834638e 10mo Initial commit
++ feature _ ./repo.feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index 5e1181e25..fe15d5acb 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-- feature ∅ ./repo.feature b834638e 10mo Initial commit
+- feature _ ./repo.feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index 4d28b8e63..a81122170 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 54fa020f1..f5e7f845a 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -27,8 +27,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
- orphan-1 ∅ ⎇ b834638e 10mo Initial commit
- orphan-2 ∅ ⎇ b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
+ orphan-1 _ ⎇ b834638e 10mo Initial commit
+ orphan-2 _ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 2 branches
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 0eae34993..33540420c 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
@@ -27,7 +27,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ?∅ ./repo.feature-a b834638e 10mo Initial commit
++ feature-a ?_ ./repo.feature-a b834638e 10mo Initial commit
+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 10mo Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index e9dfa4b67..958e6a440 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -26,15 +26,15 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-1 ∅ ./repo.feature-1 b834638e 10mo Initial commit
-+ feature-10 ∅ ./repo.feature-10 b834638e 10mo Initial commit
-+ feature-2 ∅ ./repo.feature-2 b834638e 10mo Initial commit
-+ feature-3 ∅ ./repo.feature-3 b834638e 10mo Initial commit
-+ feature-4 ∅ ./repo.feature-4 b834638e 10mo Initial commit
-+ feature-5 ∅ ./repo.feature-5 b834638e 10mo Initial commit
-+ feature-6 ∅ ./repo.feature-6 b834638e 10mo Initial commit
-+ feature-7 ∅ ./repo.feature-7 b834638e 10mo Initial commit
-+ feature-8 ∅ ./repo.feature-8 b834638e 10mo Initial commit
-+ feature-9 ∅ ./repo.feature-9 b834638e 10mo Initial commit
++ feature-1 _ ./repo.feature-1 b834638e 10mo Initial commit
++ feature-10 _ ./repo.feature-10 b834638e 10mo Initial commit
++ feature-2 _ ./repo.feature-2 b834638e 10mo Initial commit
++ feature-3 _ ./repo.feature-3 b834638e 10mo Initial commit
++ feature-4 _ ./repo.feature-4 b834638e 10mo Initial commit
++ feature-5 _ ./repo.feature-5 b834638e 10mo Initial commit
++ feature-6 _ ./repo.feature-6 b834638e 10mo Initial commit
++ feature-7 _ ./repo.feature-7 b834638e 10mo Initial commit
++ feature-8 _ ./repo.feature-8 b834638e 10mo Initial commit
++ feature-9 _ ./repo.feature-9 b834638e 10mo Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 99532be9f..b68da04b2 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
-+ feature-c ∅ ./repo.feature-c b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 10mo Initial commit
++ feature-c _ ./repo.feature-c b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index acf0f74c1..05bde4276 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ locked ∅ ⊠ ./repo.locked b834638e 10mo Initial commit
-+ normal ∅ ./repo.normal b834638e 10mo Initial commit
++ locked _ ⊠ ./repo.locked b834638e 10mo Initial commit
++ normal _ ./repo.normal b834638e 10mo Initial commit
⚪ Showing 3 worktrees
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 01a064ab0..c48a49846 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
@@ -28,6 +28,6 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^ ./repo ⇡0 ⇣0 6c3da842 10mo Initial commit on main
+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 2fff52c2 10mo Ahead commit
-+ in-sync ∅ ./repo.in-sync ⇡0 ⇣0 6c3da842 10mo Initial commit on main
++ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 10mo 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 e40962b5e..c05d1cd5f 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo e4614cb7 10mo Fix bug with café ☕ handling
-+ feature-test ∅↓ ↓1 ./repo.feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
++ feature-test _↓ ↓1 ./repo.feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 20e0e7fc6..269a1501a 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ emoji ∅ 🔄 ./repo.emoji b834638e 10mo Initial commit
-+ multi ∅ 👨‍💻 ./repo.multi b834638e 10mo Initial commit
++ emoji _ 🔄 ./repo.emoji b834638e 10mo Initial commit
++ multi _ 👨‍💻 ./repo.multi b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index b69cb70b5..c96259805 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./repo.feature-with-worktree b834638e 10mo Initial commit
- another-branch ∅ ⎇ b834638e 10mo Initial commit
- feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
- fix-bug ∅ ⎇ b834638e 10mo Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 10mo Initial commit
+ another-branch _ ⎇ b834638e 10mo Initial commit
+ feature-without-worktree _ ⎇ b834638e 10mo Initial commit
+ fix-bug _ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index 4864e9384..2f1f431b8 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-a ∅ ./repo.feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./repo.feature-b b834638e 10mo Initial commit
++ feature-a _ ./repo.feature-a b834638e 10mo Initial commit
++ feature-b _ ./repo.feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index b864f100f..445e0d254 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 10mo Initial commit
- branch-alpha ∅ ⎇ b834638e 10mo Initial commit
- branch-beta ∅ ⎇ b834638e 10mo Initial commit
- branch-gamma ∅ ⎇ b834638e 10mo Initial commit
+ branch-alpha _ ⎇ b834638e 10mo Initial commit
+ branch-beta _ ⎇ b834638e 10mo Initial commit
+ branch-gamma _ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 3 branches
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 7160acca7..3ad27cf0c 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
@@ -27,9 +27,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . ⇡0 ⇣0 b834638e 10mo Initial commit
- local-only-1 ∅ ⎇ b834638e 10mo Initial commit
- local-only-2 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-2 ∅ ⎇ b834638e 10mo Initial commit
+ local-only-1 _ ⎇ b834638e 10mo Initial commit
+ local-only-2 _ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-1 _ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-2 _ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
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 072870d14..eb1516336 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo ⇡0 ⇣0 b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./repo.feature-with-worktree b834638e 10mo Initial commit
- origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 10mo Initial commit
+ origin/remote-only _ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 1 remote branches
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 6517a3250..c393a59f5 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . ⇡0 ⇣0 b834638e 10mo Initial commit
- origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-feature-1 _ ⎇ b834638e 10mo Initial commit
+ origin/remote-feature-2 _ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 remote branches
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 af88be544..eef87073c 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -29,9 +29,9 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^ ./repo ⇡0 ⇣0 [SHA] 10mo Initial commit on main
+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 ⇣0 [SHA] 10mo Ahead commit 2
-+ behind ∅ ⇣ ./repo.behind ⇡0 ⇣1 [SHA] 10mo Initial commit on main
++ behind _ ⇣ ./repo.behind ⇡0 ⇣1 [SHA] 10mo Initial commit on main
+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 [SHA] 10mo Diverged local commit
-+ in-sync ∅ ./repo.in-sync ⇡0 ⇣0 [SHA] 10mo Initial commit on main
-+ no-upstream ∅ ./repo.no-upstream [SHA] 10mo Initial commit on main
++ in-sync _ ./repo.in-sync ⇡0 ⇣0 [SHA] 10mo Initial commit on main
++ no-upstream _ ./repo.no-upstream [SHA] 10mo Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index 6ed98d6ef..43e3fe088 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo f0879504 1d Initial commit
-+ clean-no-status ∅ ./repo.clean-no-status f0879504 1d Initial commit
-+ clean-with-status ∅ 💬 ./repo.clean-with-status f0879504 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status f0879504 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status f0879504 1d Initial commit
+ dirty-no-status ! +1 -1 ./repo.dirty-no-status f0879504 1d Initial commit
-+ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index c7a4fb49c..7fa58c249 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -28,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . [SHA] 10mo Initial commit
- feature ∅ ⎇ [SHA] 10mo Initial commit
+ feature _ ⎇ [SHA] 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 6fd8eb546..d279a9146 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature ∅ ./repo.feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index abb2f92ee..bfcbd07a4 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ also-no-changes ∅ ./repo.also-no-changes b834638e 10mo Initial commit
-+ no-changes ∅ ./repo.no-changes b834638e 10mo Initial commit
++ also-no-changes _ ./repo.also-no-changes b834638e 10mo Initial commit
++ no-changes _ ./repo.no-changes b834638e 10mo Initial commit
+ with-changes ! +1 -1 ./repo.with-changes b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index ae9c66e55..258968e74 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ huge ?∅ ./repo.huge b834638e 10mo Initial commit
++ huge ?_ ./repo.huge b834638e 10mo Initial commit
+ tiny ! +1 -1 ./repo.tiny b834638e 10mo Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index 8e7ba9e42..d712fcf14 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ feature-large ?∅ ./repo.feature-large b834638e 10mo Initial commit
-+ feature-medium ?∅ ./repo.feature-medium b834638e 10mo Initial commit
-+ feature-small ?∅ ./repo.feature-small b834638e 10mo Initial commit
++ feature-large ?_ ./repo.feature-large b834638e 10mo Initial commit
++ feature-medium ?_ ./repo.feature-medium b834638e 10mo Initial commit
++ feature-small ?_ ./repo.feature-small b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index cb93ee358..b0d6d965f 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
@ main ^ ./repo b834638e 10mo
-+ another-extremely-long-name-here ∅ ./repo.another-extremely-long-name-here b834638e 10mo
-+ short ∅ ./repo.short b834638e 10mo
-+ very-long-feature-branch-name ∅ ./repo.very-long-feature-branch-name b834638e 10mo
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 10mo
++ short _ ./repo.short b834638e 10mo
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 10mo
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index baa31a482..8eab11bd3 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
@ main ^ b834638e 10mo Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues ∅ b834638e 10mo Initial commit
-+ medium ∅ b834638e 10mo Initial commit
-+ x ∅ b834638e 10mo Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 10mo Initial commit
++ medium _ b834638e 10mo Initial commit
++ x _ b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index b25444f0e..e1e354c06 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ a ∅ ./repo.a b834638e 10mo Initial commit
-+ bb ∅ ./repo.bb b834638e 10mo Initial commit
-+ ccc ∅ ./repo.ccc b834638e 10mo Initial commit
++ a _ ./repo.a b834638e 10mo Initial commit
++ bb _ ./repo.bb b834638e 10mo Initial commit
++ ccc _ ./repo.ccc b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 65b8f7da8..5566fb5f2 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 10mo Initial commit
-+ cafe ∅ ./repo.cafe b834638e 10mo Initial commit
-+ naive ∅ ./repo.naive b834638e 10mo Initial commit
-+ resume ∅ ./repo.resume b834638e 10mo Initial commit
++ cafe _ ./repo.cafe b834638e 10mo Initial commit
++ naive _ ./repo.naive b834638e 10mo Initial commit
++ resume _ ./repo.resume b834638e 10mo Initial commit
⚪ Showing 4 worktrees