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.rsindex 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.newnew file mode 100644index 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()+---+π [36mRunning pre-merge: [1mcheck1[0m:[0m+[40m [0m [1m[34m/Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh[0m check1 3[0m++[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++π [36mRunning pre-merge: [1mcheck2[0m:[0m+[40m [0m [1m[34m/Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh[0m check2 3[0m++[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++π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36m1c75520[0m[0m (no commit/squash/rebase needed)++[40m [0m * [33m1c75520[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature++[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0m+π [36mRemoving worktree & branch...[0mdiff --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.newnew file mode 100644index 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+π [36mRunning pre-merge: [1mcheck1[0m:[0m+[40m [0m [1m[34m/Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh[0m check1 3[0m+++π [36mRunning pre-merge: [1mcheck2[0m:[0m+[40m [0m [1m[34m/Users/maximilian/workspace/worktrunk.select-diff/tests/fixtures/mixed-output.sh[0m check2 3[0m+++π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36m1c75520[0m[0m (no commit/squash/rebase needed)++[40m [0m * [33m1c75520[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature++[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0m+π [36mRemoving worktree & branch...[0m