Skip to content

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.new
deleted file mode 100644
index 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
-πŸ”„ Validating merge...
-πŸ”„ Running pre-merge command first:
-  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
-
-STDOUT-FROM-FIRST
-STDERR-FROM-FIRST
-πŸ”„ Running pre-merge command second:
-  echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2
-
-STDERR-FROM-SECOND
-STDOUT-FROM-SECOND
-πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
-
-* [SHA] (HEAD -> feature) Add feature file
-
- feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-βœ… Pushed to main (1 commit, 1 file, +1) 
-πŸ”„ Cleaning up worktree...
-
-βœ… Returned to primary at [REPO]
diff --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.snap
index 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/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/.tmpdnEI0Y/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJIKOQz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Validating merge...
πŸ”„ Running pre-merge command check1:
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh
-  check1 3
+  [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
πŸ”„ Running pre-merge command check2:
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh
-  check2 3
+  [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
πŸ”„ Rebasing onto main...
πŸ”„ Pushing 1 commit to main @ [SHA]
diff --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.new
deleted file mode 100644
index 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 -----
-πŸ”„ Validating merge...
-πŸ”„ Running pre-merge command check1:
-  [PROJECT_ROOT]/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 command check2:
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh
-  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
-πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
-
-* [SHA] (HEAD -> feature) Add feature file
-
- feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-βœ… Pushed to main (1 commit, 1 file, +1) 
-πŸ”„ Cleaning up worktree...
-
-βœ… Returned to primary at [REPO]
-
------ stderr -----