Skip to content

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

feat: Align worktree status symbols left

Maximilian Roosce6bc5273312
diff --git a/src/commands/select.rs b/src/commands/select.rs
index 6d5baf9a2..43fd5d361 100644
--- a/src/commands/select.rs
+++ b/src/commands/select.rs
@@ -368,7 +368,7 @@ pub fn handle_select() -> Result<(), GitError> {
// Add status symbols for worktrees (fixed width)
let status = if let Some(wt_info) = item.worktree_info() {
- format!("{:^8}", wt_info.status_symbols.render())
+ format!("{:<8}", wt_info.status_symbols.render())
} else {
" ".to_string()
};
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap.new
new file mode 100644
index 000000000..abf0e7898
--- /dev/null
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap.new
@@ -0,0 +1,39 @@
+---
+source: tests/integration_tests/shell_wrapper.rs
+assertion_line: 847
+expression: output.normalized()
+---
+πŸ”„ Running pre-merge: check1:
+  /Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh check1 3
+
+[check1] stdout line 1
+[check1] stderr line 1
+[check1] stdout line 2
+[check1] stderr line 2
+[check1] stdout line 3
+[check1] stderr line 3
+[check1] stdout complete
+[check1] stderr complete
+
+πŸ”„ Running pre-merge: check2:
+  /Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh check2 3
+
+[check2] stdout line 1
+[check2] stderr line 1
+[check2] stdout line 2
+[check2] stderr line 2
+[check2] stdout line 3
+[check2] stderr line 3
+[check2] stdout complete
+[check2] stderr complete
+
+πŸ”„ Merging 1 commit to main @ 1c75520 (no commit/squash/rebase needed)
+
+  * 1c75520 (HEAD -> feature) Add feature
+
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
+
+βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Returned to primary at [TMPDIR]/test-repo
+πŸ”„ Removing worktree & branch...
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap.new
new file mode 100644
index 000000000..577cb92d8
--- /dev/null
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap.new
@@ -0,0 +1,39 @@
+---
+source: tests/integration_tests/shell_wrapper.rs
+assertion_line: 847
+expression: output.normalized()
+---
+[check1] stdout line 1
+[check1] stderr line 1
+[check1] stdout line 2
+[check1] stderr line 2
+[check1] stdout line 3
+[check1] stderr line 3
+[check1] stdout complete
+[check1] stderr complete
+[check2] stdout line 1
+[check2] stderr line 1
+[check2] stdout line 2
+[check2] stderr line 2
+[check2] stdout line 3
+[check2] stderr line 3
+[check2] stdout complete
+[check2] stderr complete
+πŸ”„ Running pre-merge: check1:
+  /Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh check1 3
+
+
+πŸ”„ Running pre-merge: check2:
+  /Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh check2 3
+
+
+πŸ”„ Merging 1 commit to main @ 1c75520 (no commit/squash/rebase needed)
+
+  * 1c75520 (HEAD -> feature) Add feature
+
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
+
+βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Returned to primary at [TMPDIR]/test-repo
+πŸ”„ Removing worktree & branch...