Skip to content

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

feat: Maintain row color inheritance for status column and update snapshots

Maximilian Roos7f023ddda5f6
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index c40be9344..a0ea9784f 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -362,11 +362,8 @@ pub fn format_list_item_line(
} else {
format!("{:width$}", info.status_symbols, width = column.width)
};
- if let Some(style) = text_style {
- line.push_styled(status_text, style);
- } else {
- line.push_raw(status_text);
- }
+ // Status column never inherits row color
+ line.push_raw(status_text);
} else if !is_last {
push_blank(&mut line, column.width);
}
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 ea738dc7f..0b5c45590 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcMmBDe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ctBJ2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Main ↕ Path  Commit  Age  Message
-main    ./test-repo  6c3da842 10 months ago Initial commit on main
-feature-current ↑  ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
+main  ./test-repo  6c3da842 10 months ago Initial commit on main
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
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 28244741c..c887fdf6b 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBQpe0q/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkokc9o/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Main ↕ State  Path  Commit  Age  Message
-main    ./test-repo 1310bfb9 10 months ago Short message
-feature-a ↓  ↓1 (no commits) ./feature-a f078644e 10 months ago This is a very long commit message that should test how the message...
+main  ./test-repo 1310bfb9 10 months ago Short message
+feature-a ↓ ↓1 (no commits) ./feature-a f078644e 10 months ago This is a very long commit message that should test how the message...
Showing 2 worktrees, 1 behind
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 d47d94e0f..54358e9eb 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp16cZ5l/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmr0coS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Main ↕ State  Path  Commit  Age  Message
-main    ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ↓  ↓1 (no commits) ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
+feature-test ↓ ↓1 (no commits) ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
Showing 2 worktrees, 1 behind
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 b45437d2c..805811996 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRlA8aA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuWw6nv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Main ↕ Main ± State  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  ⇣  (matches main) ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+behind  ⇣ (matches main) ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync    (matches main) ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-no-upstream   (matches main) ./no-upstream 6c3da842 10 months ago Initial commit on main
+in-sync  (matches main) ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+no-upstream (matches main) ./no-upstream 6c3da842 10 months ago Initial commit on main
Showing 6 worktrees, 2 ahead
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 43594d998..1ac9e3a7d 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
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4o78TX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp19VPVw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Working ± State  Path  Commit  Age  Message
-main    ./test-repo  b834638e 10 months ago Initial commit
-also-no-changes   (matches main) ./also-no-changes b834638e 10 months ago Initial commit
-no-changes    (matches main) ./no-changes  b834638e 10 months ago Initial commit
+main  ./test-repo  b834638e 10 months ago Initial commit
+also-no-changes (matches main) ./also-no-changes b834638e 10 months ago Initial commit
+no-changes  (matches main) ./no-changes  b834638e 10 months ago Initial commit
with-changes ! +1 -1 ./with-changes b834638e 10 months ago 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 24122d7f0..6d6d9fc6b 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
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3ws0oN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPvsf6Y/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch Status Working ± State  Path  Commit  Age  Message
-main    ./test-repo b834638e 10 months ago Initial commit
-huge  ?  (matches main) ./huge  b834638e 10 months ago Initial commit
+main  ./test-repo b834638e 10 months ago Initial commit
+huge  ? (matches main) ./huge  b834638e 10 months ago Initial commit
tiny ! +1 -1 ./tiny b834638e 10 months ago 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 8ed741d14..19e8c2bdb 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9UEYDw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsfUzeC/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status State  Path  Commit  Age  Message
-main    ./test-repo  b834638e 10 months ago Initial commit
-feature-large  ?  (matches main) ./feature-large  b834638e 10 months ago Initial commit
-feature-medium ?  (matches main) ./feature-medium b834638e 10 months ago Initial commit
-feature-small  ?  (matches main) ./feature-small  b834638e 10 months ago Initial commit
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-large  ? (matches main) ./feature-large  b834638e 10 months ago Initial commit
+feature-medium ? (matches main) ./feature-medium b834638e 10 months ago Initial commit
+feature-small  ? (matches main) ./feature-small  b834638e 10 months ago Initial commit
Showing 4 worktrees