Skip to content

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

Update snapshots after merging main

Maximilian Roosca785552808f
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 8d680b131..0c80789cf 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7m4hKj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYjaiYI/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,7 @@ exit_code: 0
  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
@@ -43,7 +41,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 422454a6b..398804bc4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDxnhbC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp56K4n2/test-config.toml
---
success: true
exit_code: 0
@@ -25,10 +25,7 @@ exit_code: 0
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -37,7 +34,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----