Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: Update merge pre-merge command snapshots
Maximilian Roos0d5b4c3fe521
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.newdeleted file mode 100644index d0363daf9..000000000--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.new+++ /dev/null@@ -1,29 +0,0 @@-----source: tests/integration_tests/merge.rs-assertion_line: 1147-expression: output-----Exit code: 0-π [36mValidating merge...[0m-π [36mRunning pre-merge command [1m[36mfirst[0m:[0m-[40m [0m echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2--STDOUT-FROM-FIRST-STDERR-FROM-FIRST-π [36mRunning pre-merge command [1m[36msecond[0m:[0m-[40m [0m echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2--STDERR-FROM-SECOND-STDOUT-FROM-SECOND-π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m--* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-- feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)--β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m-π [36mCleaning up worktree...[0m--β [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex 1ec8c1928..92321ec7a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -12,39 +12,36 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdnEI0Y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJIKOQz/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mcheck1[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m check1 3+[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3-[check1] stderr line 1-[check1] stderr line 2-[check1] stderr line 3-[check1] stderr complete[check1] stdout line 1[check1] stdout line 2[check1] stdout line 3[check1] stdout complete+[check1] stderr line 1+[check1] stderr line 2+[check1] stderr line 3+[check1] stderr completeπ [36mRunning pre-merge command [1m[36mcheck2[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m check2 3+[40m [0m [PROJECT_ROOT]/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 line 1+[check2] stderr line 2+[check2] stderr line 3[check2] stderr completeπ [36mRebasing onto [1m[36mmain[0m...[0mπ [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.newdeleted file mode 100644index 6c370b124..000000000--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.new+++ /dev/null@@ -1,63 +0,0 @@-----source: tests/integration_tests/merge.rs-assertion_line: 12-info:- program: wt- args:- - merge- - main- - "--force"- env:- CLICOLOR_FORCE: "1"- GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"- GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""- LANG: C- LC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR8G6Ki/test-config.toml-----success: true-exit_code: 0------ stdout ------π [36mValidating merge...[0m-π [36mRunning pre-merge command [1m[36mcheck1[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m 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-π [36mRunning pre-merge command [1m[36mcheck2[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh-[40m [0m check2 3--[check2] stderr line 1-[check2] stderr line 2-[check2] stderr line 3-[check2] stderr complete-[check2] stdout line 1-[check2] stdout line 2-[check2] stdout line 3-[check2] stdout complete-π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m--* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-- feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)--β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m-π [36mCleaning up worktree...[0m--β [32mReturned to primary at [REPO][0m------- stderr -----