Skip to content

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

Fix: Update snapshots to reflect changes in Git output

Maximilian Roosf09f91569251
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index 617293aa1..7a998bd94 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -3,13 +3,13 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
+
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
-
πŸ”„ Running post-create:
  echo 'test command'
test command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index f07215dd7..8aca362b5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -3,13 +3,13 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
n
+
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
-
βšͺ Commands declined, continuing worktree creation
βœ… Created new worktree for test-decline from main at [REPO]/test-repo.test-decline
πŸ’‘ To enable automatic cd, run: wt config shell
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 9e794fde2..9be8f95a0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
+
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
@@ -12,7 +13,6 @@ y
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
-
πŸ”„ Running post-create:
  echo 'First command'
First command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 1306251b5..3f4b7eaf4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
n
+
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
@@ -12,7 +13,6 @@ n
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
-
βšͺ Commands declined, continuing worktree creation
βœ… Created new worktree for test-mixed-decline from main at [REPO]/test-repo.test-mixed-decline
πŸ’‘ To enable automatic cd, run: wt config shell
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 8a8154193..ad9c09961 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
+
🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create:
@@ -15,7 +16,6 @@ y
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
-
πŸ”„ Running post-create:
  echo 'First command'
First command
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index ab262fbfa..fcf7362ca 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/approval_pty.rs
expression: normalized
---
y
+
🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create install:
@@ -15,7 +16,6 @@ y
  echo 'Running tests...'
πŸ’‘ Allow and remember? [y/N]
-
πŸ”„ Running post-create install:
  echo 'Installing dependencies...'
Installing dependencies...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index fc55d12c6..acffda819 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -15,11 +15,10 @@ info:
GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
GIT_CONFIG_VALUE_0: "false"
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /tmp/.tmpScvSwv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjl7YC0/test-config.toml
---
success: false
exit_code: 1
@@ -28,11 +27,7 @@ exit_code: 1
❌ Rebase onto main incomplete
  Rebasing (1/1)
  error: could not apply [SHA]... Update shared.txt in feature
-  hint: Resolve all conflicts manually, mark them as resolved with
-  hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-  hint: You can instead skip this commit: run "git rebase --skip".
-  hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-  Could not apply [SHA]... Update shared.txt in feature
+  Could not apply [SHA]... # Update shared.txt in feature
----- stderr -----