Skip to content

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

Revert "Fix JSON snapshot SHA filter to match actual field name (#51)"

Maximilian Roos2e99851064f2
diff --git a/README.md b/README.md
index 3f548999d..1921ce58b 100644
--- a/README.md
+++ b/README.md
@@ -63,10 +63,10 @@ merge, cleanup.
```console
$ wt list
-Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 a1b2c3d 1d Initial commit
-+ feature-x + ↑ +5 ↑3 ./repo.feature-x a1b2c3d 1h Add file 3
-+ bugfix-y ↑ ↑1 ./repo.bugfix-y a1b2c3d 2h Fix bug
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo ⇡0 ⇣0 e6fd2060 1d Initial commit
++ feature-x + ↑ +5 ↑3 ./repo.feature-x d840828e 1h Add file 3
++ bugfix-y ↑ ↑1 ./repo.bugfix-y 22f1aa87 2h Fix bug
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
```
@@ -959,12 +959,12 @@ git config worktrunk.status.feature-x "💬"
```console
$ wt list
-Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo a1b2c3d 1d Initial commit
-+ clean-no-status _ ./repo.clean-no-status a1b2c3d 1d Initial commit
-+ clean-with-status _ 💬 ./repo.clean-with-status a1b2c3d 1d Initial commit
-+ dirty-no-status ! +1 -1 ./repo.dirty-no-status a1b2c3d 1d Initial commit
-+ dirty-with-status ?_ 🤖 ./repo.dirty-with-status a1b2c3d 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo e6fd2060 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status e6fd2060 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status e6fd2060 1d Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status e6fd2060 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status e6fd2060 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
@@ -988,12 +988,12 @@ When using Claude:
```console
$ wt list
-Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo a1b2c3d 1d Initial commit
-+ clean-no-status _ ./repo.clean-no-status a1b2c3d 1d Initial commit
-+ clean-with-status _ 💬 ./repo.clean-with-status a1b2c3d 1d Initial commit
-+ dirty-no-status ! +1 -1 ./repo.dirty-no-status a1b2c3d 1d Initial commit
-+ dirty-with-status ?_ 🤖 ./repo.dirty-with-status a1b2c3d 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo e6fd2060 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status e6fd2060 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status e6fd2060 1d Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status e6fd2060 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status e6fd2060 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
```
diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rs
index 70fffc149..56f9794c6 100644
--- a/tests/common/list_snapshots.rs
+++ b/tests/common/list_snapshots.rs
@@ -21,10 +21,6 @@ fn base_settings(repo: &TestRepo) -> Settings {
pub fn standard_settings(repo: &TestRepo) -> Settings {
let mut settings = base_settings(repo);
- // Filter SHAs: match 7-40 hex chars that are either at boundaries or wrapped in ANSI codes
- // The \b word boundary doesn't work when SHA follows ANSI sequence (e.g., [2me6fd2060)
- // because 'm' and 'e' are both word characters. Use negative lookbehind/lookahead instead.
- settings.add_filter(r"\x1b\[[0-9;]*m[0-9a-f]{7,40}\x1b\[[0-9;]*m", "[SHA] ");
settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA] ");
// Normalize WORKTRUNK_CONFIG_PATH across platforms (macOS, Linux, Windows)
// macOS: /var/folders/.../T/.tmpXXX/test-config.toml
@@ -38,7 +34,7 @@ pub fn standard_settings(repo: &TestRepo) -> Settings {
pub fn json_settings(repo: &TestRepo) -> Settings {
let mut settings = base_settings(repo);
- settings.add_filter(r#""head_sha": "[0-9a-f]{40}""#, r#""head_sha": "[SHA]""#);
+ settings.add_filter(r#""head": "[0-9a-f]{40}""#, r#""head": "[SHA]""#);
settings.add_filter(r#""timestamp": \d+"#, r#""timestamp": 0"#);
settings.add_filter(r"\\u001b\[32m", "[GREEN]");
settings.add_filter(r"\\u001b\[31m", "[RED]");
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 71c3b1f4b..11bd93c4c 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -804,11 +804,6 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
// Match if followed by a letter/character (not "#")
settings.add_filter(r"(Could not apply \[SHA\]\.\.\.) ([A-Za-z])", "$1 # $2");
- // Normalize OS-specific error messages in gutter output
- // Ubuntu may produce "Broken pipe (os error 32)" instead of the expected error
- // when capturing stderr from shell commands due to timing/buffering differences
- settings.add_filter(r"Broken pipe \(os error 32\)", "Error: connection refused");
-
settings
}
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index cbb6e7673..574599fd3 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -1100,7 +1100,7 @@ approved-commands = [
// 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_content = fs::read(fixtures_dir.join("mixed-output.sh")).unwrap();
+ 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
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 e5067cc7d..78c445f00 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
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
- branch-only _ ⎇ [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ branch-only _ ⎇ b834638e 1d 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 c24bb03ae..56d67c585 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
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ⚐ . [SHA] 1d Initial commit
+@ develop ^ ⚐ . b834638e 1d 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 0ae4a663c..63a60c9f3 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ ⚐ . [SHA] 1d Initial commit
+@ - ^ ⚐ . b834638e 1d Initial commit
⚪ Showing 1 worktree
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 759dd1e0b..7be85cde4 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ - _ ⚐ ./repo.feature [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ - _ ⚐ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index 32ecb34b8..354066549 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
[
{
- "head_sha": "[SHA]",
+ "head_sha": "133d1f05a73a1478707f3438625069c7ebd8eb27",
"branch": "main",
"timestamp": 0,
"commit_message": "Same content on main",
@@ -75,7 +75,7 @@ exit_code: 0
"is_current": true
},
{
- "head_sha": "[SHA]",
+ "head_sha": "d78d130165cc11f6df39113ded5bbf1c16f8ebc3",
"branch": "feature-merged",
"timestamp": 0,
"commit_message": "Merge main into feature",
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 6009c8671..3e84113dc 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
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1735776000"
+ SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
[
{
- "head_sha": "[SHA]",
+ "head_sha": "a27cd57d20a6211799da676e70edefa5152f99fe",
"branch": "main",
"timestamp": 0,
"commit_message": "Main commit 2",
@@ -75,7 +75,7 @@ exit_code: 0
"is_current": true
},
{
- "head_sha": "[SHA]",
+ "head_sha": "f16cd37915d5ee93903252f5cf877c76c54f3d50",
"branch": "feature-ahead",
"timestamp": 0,
"commit_message": "Feature commit 2",
@@ -125,7 +125,7 @@ exit_code: 0
"working_diff_display": "/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m"
},
{
- "head_sha": "[SHA]",
+ "head_sha": "6c3da84215d400bf6e05a7f9cd1efcfbd825b9e9",
"branch": "feature-behind",
"timestamp": 0,
"commit_message": "Initial commit on main",
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index ce474b593..b21246be6 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1735776000"
+ SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
[
{
- "head_sha": "[SHA]",
+ "head_sha": "f4fa1ba1ca52a38a0036c3c9dd8b486a83ced1e5",
"branch": "main",
"timestamp": 0,
"commit_message": "Main conflicting changes",
@@ -75,7 +75,7 @@ exit_code: 0
"is_current": true
},
{
- "head_sha": "[SHA]",
+ "head_sha": "f4fa1ba1ca52a38a0036c3c9dd8b486a83ced1e5",
"branch": "feature",
"timestamp": 0,
"commit_message": "Main conflicting changes",
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 f9e2224dc..86379ffb2 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1735776000"
+ SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
[
{
- "head_sha": "[SHA]",
+ "head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
"branch": "main",
"timestamp": 0,
"commit_message": "Initial commit",
@@ -75,7 +75,7 @@ exit_code: 0
"is_current": true
},
{
- "head_sha": "[SHA]",
+ "head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
"branch": "feature-detached",
"timestamp": 0,
"commit_message": "Initial commit",
@@ -125,7 +125,7 @@ exit_code: 0
"is_main": false
},
{
- "head_sha": "[SHA]",
+ "head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
"branch": "locked-feature",
"timestamp": 0,
"commit_message": "Initial commit",
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 2009ad17c..cbf892531 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
[
{
- "head_sha": "[SHA]",
+ "head_sha": "e6fd20606574fd9fa70e05e84654c7be500cda38",
"branch": "main",
"timestamp": 0,
"commit_message": "Initial commit",
@@ -75,7 +75,7 @@ exit_code: 0
"is_current": true
},
{
- "head_sha": "[SHA]",
+ "head_sha": "e6fd20606574fd9fa70e05e84654c7be500cda38",
"branch": "with-status",
"timestamp": 0,
"commit_message": "Initial commit",
@@ -127,7 +127,7 @@ exit_code: 0
"is_main": false
},
{
- "head_sha": "[SHA]",
+ "head_sha": "e6fd20606574fd9fa70e05e84654c7be500cda38",
"branch": "without-status",
"timestamp": 0,
"commit_message": "Initial commit",
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 a4ef6d204..0d4e1b8d7 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged [SHA] 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes [SHA] 1d Add 100 lines
-+ fix ?_ 💬 ./repo.fix [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
++ fix ?_ 💬 ./repo.fix b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index d9d48b5b8..6e9580db4 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current [SHA] 23h Commit at 01:00
-^ main ^ ./repo [SHA] 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest [SHA] 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle [SHA] 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest [SHA] 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
⚪ Showing 5 worktrees, 4 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 e3002f2e9..8b970b75d 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ⚐ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
+@ develop ^ ⚐ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 312f09cda..9ac35b177 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
@@ -20,8 +20,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 f152ea0c0..dbe7e1e49 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ locked-no-reason _ ⊠ ./repo.locked-no-reason [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-no-reason _ ⊠ ./repo.locked-no-reason b834638e 1d 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 e5d605e84..c62854c17 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ locked-feature _ ⊠ ./repo.locked-feature [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-feature _ ⊠ ./repo.locked-feature b834638e 1d 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 caabfcdbc..ebf5d6c02 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Short message
-+ feature-a _↓ ↓1 ./repo.feature-a [SHA] 1d This is a very long commit message that should test how the…
+@ main ^ ./repo 1310bfb9 1d Short message
++ feature-a _↓ ↓1 ./repo.feature-a f078644e 1d 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 f1735a978..100510500 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ medium-name _ ./repo.medium-name [SHA] 1d Initial commit
-+ short _ ./repo.short [SHA] 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here [SHA] 1d Initial commit
-+ with-changes _ ./repo.with-changes [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ medium-name _ ./repo.medium-name b834638e 1d Initial commit
++ short _ ./repo.short b834638e 1d Initial commit
++ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
++ with-changes _ ./repo.with-changes b834638e 1d Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 408b8840d..8d96fc8d9 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./repo ⇡1 ⇣0 [SHA] 1d Main advances
-+ feature +!?⊘↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 [SHA] 1d Local commit
+@ main ^⇡ ./repo ⇡1 ⇣0 85ed6d3d 1d Main advances
++ feature +!?⊘↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d 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 5dadb128e..88f60586c 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
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo [SHA] 1d Main conflicting changes
-+ feature +!?✖ ⊠🤖 +7 ./repo.feature [SHA] 1d Main conflicting changes
+@ main ^ ./repo b7c14ce1 1d Main conflicting changes
++ feature +!?✖ ⊠🤖 +7 ./repo.feature b7c14ce1 1d 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 d157a01bf..e4d1e7b30 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./repo.feature [SHA] 1d Add files
+@ main ^ ./repo b834638e 1d Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d 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 a2f85b6d0..28d7ecbac 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 31fbdeea8..714dfcf98 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature _ ./repo.feature [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature _ ./repo.feature b834638e 1d 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 4032bd8e8..d15addcfa 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-- feature _ ./repo.feature [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
+- feature _ ./repo.feature b834638e 1d 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 1ee60d5d8..81189e764 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 68f182d48..060b2bab6 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
- orphan-1 _ ⎇ [SHA] 1d Initial commit
- orphan-2 _ ⎇ [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
+ orphan-1 _ ⎇ b834638e 1d Initial commit
+ orphan-2 _ ⎇ b834638e 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
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 a0124cd0a..623dda803 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 [SHA] 1d Initial commit
-+ feature-x + ↑ +5 ↑3 ./repo.feature-x [SHA] 1h Add file 3
-+ bugfix-y ↑ ↑1 ./repo.bugfix-y [SHA] 2h Fix bug
+@ main ^ ./repo ⇡0 ⇣0 e6fd2060 1d Initial commit
++ feature-x + ↑ +5 ↑3 ./repo.feature-x d840828e 1h Add file 3
++ bugfix-y ↑ ↑1 ./repo.bugfix-y 22f1aa87 2h Fix bug
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index df77cb69b..34feea6ee 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d 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 2276cf395..61e657616 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ./repo.main-symbol [SHA] 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./repo.pr-link [SHA] 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence [SHA] 1d Initial content
+@ main ^ ./repo b834638e 1d Initial commit
++ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
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 746bb2adf..96892d824 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ ⚐ . [SHA] 1d Initial commit
+@ - ^ ⚐ . b834638e 1d 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 8dd9b9ba1..476cf4513 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
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a ?_ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b [SHA] 1d Test commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a ?_ ./repo.feature-a b834638e 1d Initial commit
++ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d 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 a4b316015..06e8e4cff 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
@@ -25,16 +25,16 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-1 _ ./repo.feature-1 [SHA] 1d Initial commit
-+ feature-10 _ ./repo.feature-10 [SHA] 1d Initial commit
-+ feature-2 _ ./repo.feature-2 [SHA] 1d Initial commit
-+ feature-3 _ ./repo.feature-3 [SHA] 1d Initial commit
-+ feature-4 _ ./repo.feature-4 [SHA] 1d Initial commit
-+ feature-5 _ ./repo.feature-5 [SHA] 1d Initial commit
-+ feature-6 _ ./repo.feature-6 [SHA] 1d Initial commit
-+ feature-7 _ ./repo.feature-7 [SHA] 1d Initial commit
-+ feature-8 _ ./repo.feature-8 [SHA] 1d Initial commit
-+ feature-9 _ ./repo.feature-9 [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
++ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
++ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
++ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
++ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
++ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
++ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
++ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
++ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
++ feature-9 _ ./repo.feature-9 b834638e 1d 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 2f06defca..35b09016f 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
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
-+ feature-c _ ./repo.feature-c [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-c _ ./repo.feature-c b834638e 1d Initial commit
⚪ Showing 4 worktrees
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 3f60858f7..ebbdcec92 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
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current [SHA] 23h Commit at 01:00
-^ main ^ ./repo [SHA] 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest [SHA] 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle [SHA] 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest [SHA] 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
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 43b3ff4c8..d83612be2 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d 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 ddd726590..773b56b45 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ locked _ ⊠ ./repo.locked [SHA] 1d Initial commit
-+ normal _ ./repo.normal [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked _ ⊠ ./repo.locked b834638e 1d Initial commit
++ normal _ ./repo.normal b834638e 1d 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 67de8c8ac..98bb73218 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 [SHA] 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 [SHA] 1d Ahead commit
-+ in-sync _ ./repo.in-sync ⇡0 ⇣0 [SHA] 1d Initial commit on main
+@ main ^ ./repo ⇡0 ⇣0 6c3da842 1d Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 2fff52c2 1d Ahead commit
++ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 1d 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 569c39bf4..67b71ea57 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Fix bug with café ☕ handling
-+ feature-test _↓ ↓1 ./repo.feature-test [SHA] 1d Add support for 日本語 and émoji 🎉
+@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
++ feature-test _↓ ↓1 ./repo.feature-test 0c53695b 1d 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 198758d59..742fb8c60 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji [SHA] 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
++ multi _ 👨‍💻 ./repo.multi b834638e 1d 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 0b9ba3310..35fde2cc4 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree [SHA] 1d Initial commit
- another-branch _ ⎇ [SHA] 1d Initial commit
- feature-without-worktree _ ⎇ [SHA] 1d Initial commit
- fix-bug _ ⎇ [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ another-branch _ ⎇ b834638e 1d Initial commit
+ feature-without-worktree _ ⎇ b834638e 1d Initial commit
+ fix-bug _ ⎇ b834638e 1d 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 d5d628ffa..b4c3ba253 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-a _ ./repo.feature-a [SHA] 1d Initial commit
-+ feature-b _ ./repo.feature-b [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 d43bb31b8..f7ebc73c0 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
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
- branch-alpha _ ⎇ [SHA] 1d Initial commit
- branch-beta _ ⎇ [SHA] 1d Initial commit
- branch-gamma _ ⎇ [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ branch-alpha _ ⎇ b834638e 1d Initial commit
+ branch-beta _ ⎇ b834638e 1d Initial commit
+ branch-gamma _ ⎇ b834638e 1d 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 fe5ac8b3e..5ebde7bd9 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -26,10 +26,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ⇡0 ⇣0 [SHA] 1d Initial commit
- local-only-1 _ ⎇ [SHA] 1d Initial commit
- local-only-2 _ ⎇ [SHA] 1d Initial commit
- origin/remote-only-1 _ ⎇ [SHA] 1d Initial commit
- origin/remote-only-2 _ ⎇ [SHA] 1d Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
+ local-only-1 _ ⎇ b834638e 1d Initial commit
+ local-only-2 _ ⎇ b834638e 1d Initial commit
+ origin/remote-only-1 _ ⎇ b834638e 1d Initial commit
+ origin/remote-only-2 _ ⎇ b834638e 1d 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 bc7800d6d..577d88c1f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 [SHA] 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree [SHA] 1d Initial commit
- origin/remote-only _ ⎇ [SHA] 1d Initial commit
+@ main ^ ./repo ⇡0 ⇣0 b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ origin/remote-only _ ⎇ b834638e 1d 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 afbbb11c7..70d3d4f3f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ⇡0 ⇣0 [SHA] 1d Initial commit
- origin/remote-feature-1 _ ⎇ [SHA] 1d Initial commit
- origin/remote-feature-2 _ ⎇ [SHA] 1d Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
+ origin/remote-feature-1 _ ⎇ b834638e 1d Initial commit
+ origin/remote-feature-2 _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 remote branches
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 d60b6ea09..e78121e9b 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ clean-no-status _ ./repo.clean-no-status [SHA] 1d Initial commit
-+ clean-with-status _ 💬 ./repo.clean-with-status [SHA] 1d Initial commit
-+ dirty-no-status ! +1 -1 ./repo.dirty-no-status [SHA] 1d Initial commit
-+ dirty-with-status ?_ 🤖 ./repo.dirty-with-status [SHA] 1d Initial commit
+@ main ^ ./repo e6fd2060 1d Initial commit
++ clean-no-status _ ./repo.clean-no-status e6fd2060 1d Initial commit
++ clean-with-status _ 💬 ./repo.clean-with-status e6fd2060 1d Initial commit
++ dirty-no-status ! +1 -1 ./repo.dirty-no-status e6fd2060 1d Initial commit
++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status e6fd2060 1d Initial commit
⚪ Showing 5 worktrees, 1 with changes
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 dd861b1a5..328bcf38b 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes [SHA] 1d Initial commit
-+ no-changes _ ./repo.no-changes [SHA] 1d Initial commit
-+ with-changes ! +1 -1 ./repo.with-changes [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
++ no-changes _ ./repo.no-changes b834638e 1d Initial commit
++ with-changes ! +1 -1 ./repo.with-changes b834638e 1d 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 5dc95f2e0..cf39e2e9b 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ huge ?_ ./repo.huge [SHA] 1d Initial commit
-+ tiny ! +1 -1 ./repo.tiny [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ huge ?_ ./repo.huge b834638e 1d Initial commit
++ tiny ! +1 -1 ./repo.tiny b834638e 1d 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 d54ed92f3..7eb1cdc94 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ feature-large ?_ ./repo.feature-large [SHA] 1d Initial commit
-+ feature-medium ?_ ./repo.feature-medium [SHA] 1d Initial commit
-+ feature-small ?_ ./repo.feature-small [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-large ?_ ./repo.feature-large b834638e 1d Initial commit
++ feature-medium ?_ ./repo.feature-medium b834638e 1d Initial commit
++ feature-small ?_ ./repo.feature-small b834638e 1d 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 a5bd13faa..e06e43f15 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./repo [SHA] 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here [SHA] 1d
-+ short _ ./repo.short [SHA] 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name [SHA] 1d
+@ main ^ ./repo b834638e 1d
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
++ short _ ./repo.short b834638e 1d
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
⚪ 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 c29a7abe8..5437e36fa 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^ [SHA] 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ [SHA] 1d Initial commit
-+ medium _ [SHA] 1d Initial commit
-+ x _ [SHA] 1d Initial commit
+@ main ^ b834638e 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
++ medium _ b834638e 1d Initial commit
++ x _ b834638e 1d 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 71ebcc537..96a55d61d 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ a _ ./repo.a [SHA] 1d Initial commit
-+ bb _ ./repo.bb [SHA] 1d Initial commit
-+ ccc _ ./repo.ccc [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ a _ ./repo.a b834638e 1d Initial commit
++ bb _ ./repo.bb b834638e 1d Initial commit
++ ccc _ ./repo.ccc b834638e 1d 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 70fee3040..6d0ec315f 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ cafe _ ./repo.cafe [SHA] 1d Initial commit
-+ naive _ ./repo.naive [SHA] 1d Initial commit
-+ resume _ ./repo.resume [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ cafe _ ./repo.cafe b834638e 1d Initial commit
++ naive _ ./repo.naive b834638e 1d Initial commit
++ resume _ ./repo.resume b834638e 1d Initial commit
⚪ Showing 4 worktrees