Skip to content

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

feat: Indicate main worktree in list output

Maximilian Roos2a56fe64391f
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index e72cfcb4f..2fd24592b 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -262,6 +262,13 @@ fn compute_item_status_symbols(
branch_state
};
+ // Override main_divergence for the main worktree
+ let main_divergence = if data.is_main {
+ MainDivergence::IsMain
+ } else {
+ main_divergence
+ };
+
item.status_symbols = Some(StatusSymbols {
branch_state,
git_operation,
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index b5930e6a9..3a4668753 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -277,6 +277,8 @@ pub enum MainDivergence {
/// Up to date with main branch
#[default]
None,
+ /// This is the main/default branch itself
+ IsMain,
/// Ahead of main (has commits main doesn't have)
Ahead,
/// Behind main (missing commits from main)
@@ -289,6 +291,7 @@ impl std::fmt::Display for MainDivergence {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Self::None => Ok(()),
+ Self::IsMain => write!(f, "^"),
Self::Ahead => write!(f, "↑"),
Self::Behind => write!(f, "↓"),
Self::Diverged => write!(f, "↕"),
@@ -448,7 +451,7 @@ impl PositionMask {
5, // WORKING_TREE: ?!+»✘ (max 5 symbols)
1, // BRANCH_STATE: ✖⚠≡∅ (1 char, mutually exclusive)
1, // GIT_OPERATION: ↻ or ⋈ (1 char)
- 1, // MAIN_DIVERGENCE: ↑, ↓, ↕ (1 char)
+ 1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)
1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)
1, // ITEM_ATTRS: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
2, // USER_STATUS: single emoji or two chars (allocate 2)
@@ -467,7 +470,7 @@ impl PositionMask {
/// - Working tree: ?, !, +, », ✘
/// - Branch state: ✖, ⚠, ≡, ∅ (mutually exclusive)
/// - Git operation: ↻, ⋈
-/// - Main divergence: ↑, ↓, ↕
+/// - Main divergence: ^, ↑, ↓, ↕
/// - Upstream divergence: ⇡, ⇣, ⇅
/// - Item attributes: ⎇ for branches, ⌫⊠ for worktrees (priority-only)
/// - User status: custom labels, emoji
@@ -477,7 +480,7 @@ impl PositionMask {
/// **Mutually exclusive (enforced by type system):**
/// - ✖ vs ⚠ vs ≡ vs ∅: BranchState enum (combined position)
/// - ↻ vs ⋈: Git operation (GitOperation enum)
-/// - ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
+/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)
///
/// **Priority-only (can co-occur but only highest priority shown):**
@@ -741,6 +744,7 @@ impl serde::Serialize for StatusSymbols {
let main_divergence_variant = match self.main_divergence {
MainDivergence::None => "",
+ MainDivergence::IsMain => "IsMain",
MainDivergence::Ahead => "Ahead",
MainDivergence::Behind => "Behind",
MainDivergence::Diverged => "Diverged",
diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rs
index 2cd84c463..9c53745e5 100644
--- a/tests/common/list_snapshots.rs
+++ b/tests/common/list_snapshots.rs
@@ -10,6 +10,7 @@ fn base_settings(repo: &TestRepo) -> Settings {
settings.add_filter(r"\\", "/");
// Redact volatile metadata captured by insta-cmd (same as common::setup_snapshot_settings)
+ settings.add_redaction(".env.GIT_CONFIG_GLOBAL", "[TEST_GIT_CONFIG]");
settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");
settings.add_redaction(".env.HOME", "[TEST_HOME]");
settings.add_redaction(".env.XDG_CONFIG_HOME", "[TEST_CONFIG_HOME]");
diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rs
index 2ba92dd85..e56329da8 100644
--- a/tests/integration_tests/security.rs
+++ b/tests/integration_tests/security.rs
@@ -373,6 +373,8 @@ fn test_commit_message_with_directive_not_executed() {
#[cfg(unix)]
#[test]
fn test_path_with_directive_not_executed() {
+ use crate::common::setup_snapshot_settings;
+
let repo = TestRepo::new();
repo.commit("Initial commit");
@@ -382,8 +384,7 @@ fn test_path_with_directive_not_executed() {
.join("__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked5");
std::fs::create_dir_all(&malicious_dir).expect("Failed to create malicious directory");
- let mut settings = Settings::clone_current();
- settings.set_snapshot_path("../snapshots");
+ let settings = setup_snapshot_settings(&repo);
// Run a command that might display this path
settings.bind(|| {
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 26ff5280f..5648c624f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -14,7 +14,7 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRpftLl/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPGzGyI/test-config.toml
---
success: true
exit_code: 0
@@ -22,7 +22,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo.main 6c3da842 10 months ago Initial commit on main
+@ main ^ ./test-repo.main 6c3da842 10 months ago Initial commit on main
+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10 months ago Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index c4114d30c..6fdc68fb2 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -10,16 +10,13 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7zaUWv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-config.toml
---
success: true
exit_code: 0
@@ -27,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 553555146..7ad42a1f8 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . b834638e 10 months ago Initial commit
branch-only ∅ ⎇ b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 51b8264d7..2ccf783a5 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop . b834638e 10 months ago Initial commit
+@ develop ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 5843523cb..3be0333e0 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - . b834638e 10 months ago Initial commit
+@ - ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 faa6e1270..831ba79c2 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -50,14 +47,14 @@ exit_code: 0
},
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "IsMain",
"upstream_divergence": ""
},
"status_symbols": {
"working_tree": "",
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "^",
"upstream_divergence": "",
"worktree_attrs": ""
},
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 b023be851..23d32bf21 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -50,14 +47,14 @@ exit_code: 0
},
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "IsMain",
"upstream_divergence": ""
},
"status_symbols": {
"working_tree": "",
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "^",
"upstream_divergence": "",
"worktree_attrs": ""
},
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 6c5b291fd..3faa5db46 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -50,14 +47,14 @@ exit_code: 0
},
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "IsMain",
"upstream_divergence": ""
},
"status_symbols": {
"working_tree": "",
"branch_state": "",
"git_operation": "",
- "main_divergence": "",
+ "main_divergence": "^",
"upstream_divergence": "",
"worktree_attrs": ""
},
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 f238edb21..88ef9fb1e 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ 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
+ fix ? ≡ 💬 ./fix b834638e 10 months ago Initial commit
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 85e542d20..3b2bda961 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ./test-repo 6c3da842 10 months ago Initial commit on main
+^ 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
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 7f6edb921..c62fc9852 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ./test-repo b834638e 10 months ago Initial commit
+@ develop ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
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 fa1ecf4fc..91c51f728 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
@@ -4,7 +4,7 @@ info:
program: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppL7rf6/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ6jRiw/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -17,7 +17,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
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 45723a217..ea2f18df0 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10 months ago 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 1c11bf724..f82e234b4 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ locked-feature ≡ ⊠ ./locked-feature b834638e 10 months ago 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 c931fdec0..91bfed030 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo 1310bfb9 10 months ago Short 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…
⚪ 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 727da5bb3..b796100d3 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ./test-repo b834638e 10 months ago
+@ main ^ ./test-repo b834638e 10 months ago
+ medium-name ≡ ./medium-name b834638e 10 months ago
+ short ≡ ./short b834638e 10 months ago
+ very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago
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 e5de3ac8a..40e0677ef 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,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
+@ 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_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index bf0a912ea..e018247de 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ./test-repo b7c14ce1 10 months ago Main conflicting changes
+@ main ^ ./test-repo b7c14ce1 10 months ago Main conflicting changes
+ feature ?!+ ✖↻ ⊠🤖 +7 ./feature b7c14ce1 10 months ago Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
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 92b58c020..e9210218c 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ 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__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 67fd45e92..8da52866d 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
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 71064d049..67494a7cf 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature ≡ ./feature b834638e 10 months ago 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 98e0b6e5f..81bbaf267 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
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 ddfa74ed2..213d766bf 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -11,11 +11,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -28,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
orphan-1 ∅ ⎇ b834638e 10 months ago Initial commit
orphan-2 ∅ ⎇ b834638e 10 months ago Initial commit
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 e1b5a3400..885126d83 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,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
+@ 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
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 23a8d85e8..a00fccd49 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 adc40bd09..113e83cde 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ 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
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 22d19223d..5cecd4ee0 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - . b834638e 10 months ago Initial commit
+@ - ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 8e2c18645..69f35398d 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
@@ -11,11 +11,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -28,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ 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
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 695f6fb36..04fa595a1 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-1 ≡ ./feature-1 b834638e 10 months ago Initial commit
+ feature-10 ≡ ./feature-10 b834638e 10 months ago Initial commit
+ feature-2 ≡ ./feature-2 b834638e 10 months ago Initial commit
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 0f33bf187..74d6ea2fc 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+ feature-c ≡ ./feature-c b834638e 10 months ago Initial commit
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 1782a031f..f14c22654 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ./test-repo 6c3da842 10 months ago Initial commit on main
+^ 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
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index f479bfeb5..35b92cb6c 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 348b0ab70..837d5cdc7 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ locked ≡ ⊠ ./locked b834638e 10 months ago Initial commit
+ normal ≡ ./normal b834638e 10 months ago Initial commit
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 a24655849..3ff9eea08 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
@@ -11,11 +11,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -28,7 +25,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
+@ 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
+ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
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 2a28d65a9..6725130f0 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ 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
+@ 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 🎉
⚪ 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 a74c42084..cc91815bd 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ emoji ≡ 🔄 ./emoji b834638e 10 months ago Initial commit
+ multi ≡ 👨‍💻 ./multi b834638e 10 months ago Initial commit
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 327142768..2e95cfbdb 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
another-branch ∅ ⎇ b834638e 10 months ago Initial commit
feature-without-worktree ∅ ⎇ b834638e 10 months ago Initial commit
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 780b1dd6b..9547e179e 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+ feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
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 529debcf5..02f341a3e 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . b834638e 10 months ago Initial commit
branch-alpha ∅ ⎇ b834638e 10 months ago Initial commit
branch-beta ∅ ⎇ b834638e 10 months ago Initial commit
branch-gamma ∅ ⎇ b834638e 10 months ago Initial commit
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 0752fba90..68f5c34b7 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
@@ -11,11 +11,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -28,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . ↑0 ↓0 b834638e 10 months ago Initial commit
+@ main ^ . ↑0 ↓0 b834638e 10 months ago Initial commit
local-only-1 ∅ ⎇ b834638e 10 months ago Initial commit
local-only-2 ∅ ⎇ b834638e 10 months ago Initial commit
origin/remote-only-1 ∅ ⎇ b834638e 10 months ago 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 0ff8ded78..71a517cc9 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,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
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10 months ago Initial commit
+ feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
origin/remote-only ∅ ⎇ b834638e 10 months ago 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 112c2eb2c..539cfc8c1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . ↑0 ↓0 b834638e 10 months ago Initial commit
+@ main ^ . ↑0 ↓0 b834638e 10 months ago Initial commit
origin/remote-feature-1 ∅ ⎇ b834638e 10 months ago Initial commit
origin/remote-feature-2 ∅ ⎇ b834638e 10 months ago 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 5bd45d71e..e0802de55 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -11,17 +11,14 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZeSbTH/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/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/.tmpZeSbTH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-config.toml
---
success: true
exit_code: 0
@@ -29,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
+@ 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
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 5d0d16452..70edac3b8 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ clean-no-status ≡ ./clean-no-status b834638e 10 months ago Initial commit
+ clean-with-status ≡ 💬 ./clean-with-status b834638e 10 months ago Initial commit
+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index 057cec232..9fa3ce2a4 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -28,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . [SHA] 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
⚪ Showing 1 worktree
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 49a068567..8e5e70df7 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
@@ -10,11 +10,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -29,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . [SHA] 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
feature ∅ ⎇ [SHA] 10 months ago Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index 057cec232..9fa3ce2a4 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -28,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . [SHA] 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index 057cec232..9fa3ce2a4 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -28,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . [SHA] 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index 057cec232..9fa3ce2a4 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -28,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . [SHA] 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
⚪ Showing 1 worktree
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 cdb9cb00c..68e328308 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >…
+@ main ^ ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >…
+ feature ≡ ./feature [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 99b8b85bf..45f1e6cd8 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -9,16 +9,13 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpU2gA5K/test-config.toml
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
@@ -26,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main . b834638e 10 months ago Initial commit
+@ main ^ . [SHA] 10 months ago Initial commit
⚪ Showing 1 worktree
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 a1900edfa..2283a5cf6 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
+ no-changes ≡ ./no-changes b834638e 10 months ago Initial commit
+ with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
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 12af58f93..4c038fd38 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ huge ? ≡ ./huge b834638e 10 months ago Initial commit
+ tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
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 552bdb8ac..25a3be712 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ feature-large ? ≡ ./feature-large b834638e 10 months ago Initial commit
+ feature-medium ? ≡ ./feature-medium b834638e 10 months ago Initial commit
+ feature-small ? ≡ ./feature-small b834638e 10 months ago Initial commit
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 d5bc078eb..6d7a77a5c 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ./test-repo b834638e 10 months ago
+@ main ^ ./test-repo b834638e 10 months ago
+ another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago
+ short ≡ ./short b834638e 10 months ago
+ very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10 months ago
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 a12e8cc63..8c39f245c 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ./test-repo b834638e 10 months ago
+@ main ^ ./test-repo b834638e 10 months ago
+ long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago
+ medium ≡ ./medium-length-name b834638e 10 months ago
+ x ≡ ./x b834638e 10 months ago
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 72c423bac..83999771c 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ a ≡ ./a b834638e 10 months ago Initial commit
+ bb ≡ ./bb b834638e 10 months ago Initial commit
+ ccc ≡ ./ccc b834638e 10 months ago Initial commit
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 5aa7a066b..9a54f7ab3 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
@@ -9,11 +9,8 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_COUNT: "1"
- GIT_CONFIG_GLOBAL: /dev/null
- GIT_CONFIG_KEY_0: advice.mergeConflict
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
- GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ./test-repo b834638e 10 months ago Initial commit
+@ main ^ ./test-repo b834638e 10 months ago Initial commit
+ cafe ≡ ./café b834638e 10 months ago Initial commit
+ naive ≡ ./naïve b834638e 10 months ago Initial commit
+ resume ≡ ./résumé b834638e 10 months ago Initial commit