Skip to content

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

feat: Change gutter background to bright black

Maximilian Roosf7f9234393df
diff --git a/.claude-plugin/skills/worktrunk/reference/README.md b/.claude-plugin/skills/worktrunk/reference/README.md
index 28895d3e6..00b483d2a 100644
--- a/.claude-plugin/skills/worktrunk/reference/README.md
+++ b/.claude-plugin/skills/worktrunk/reference/README.md
@@ -18,8 +18,7 @@ colliding; each agent gets a separate directory with a version of the code. But
creating worktrees, tracking paths & statuses, cleaning up, etc, is manual.
Worktrunk offers control, transparency & automation for this workflow.
-<!-- TODO: Add demo gif when available -->
-<!-- ![Worktrunk Demo](scripts/wt-demo/out/wt-demo.gif) -->
+![Worktrunk Demo](scripts/wt-demo/out/wt-demo.gif)
## Quick Start
@@ -614,7 +613,7 @@ Order: `?!+»✘ ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`
- `⌫` Prunable worktree (directory missing, can be pruned)
- `⊠` Locked worktree (protected from auto-removal)
-*Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).*
+_Rows are dimmed when no unique work (≡ matches main OR ∅ no commits)._
**JSON OUTPUT:**
@@ -622,6 +621,7 @@ Use `--format=json` for structured data. Each object contains two status maps
with the same fields in the same order as STATUS SYMBOLS above:
**`status`** - variant names for querying:
+
- `working_tree`: `{untracked, modified, staged, renamed, deleted}` booleans
- `branch_state`: `""` | `"Conflicts"` | `"MergeTreeConflicts"` | `"MatchesMain"` | `"NoCommits"`
- `git_operation`: `""` | `"Rebase"` | `"Merge"`
diff --git a/src/styling/format.rs b/src/styling/format.rs
index 287e69895..c43664a30 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -115,7 +115,7 @@ pub(super) fn wrap_text_at_width(text: &str, max_width: usize) -> Vec<String> {
/// print!("{}", format_with_gutter(&config, "", None));
/// ```
pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<usize>) -> String {
- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));
+ let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
let mut output = String::new();
// Use provided width or detect terminal width (respects COLUMNS env var)
@@ -152,7 +152,7 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<us
pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
use tree_sitter_highlight::{HighlightConfiguration, HighlightEvent, Highlighter};
- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));
+ let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
let mut output = String::new();
// Calculate available width for wrapping
@@ -258,7 +258,7 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
/// It provides the same gutter formatting without tree-sitter dependencies.
#[cfg(not(feature = "syntax-highlighting"))]
pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));
+ let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
let mut output = String::new();
// Calculate available width for wrapping
diff --git a/src/styling/highlighting.rs b/src/styling/highlighting.rs
index 95b4bb807..ed6e974b9 100644
--- a/src/styling/highlighting.rs
+++ b/src/styling/highlighting.rs
@@ -72,7 +72,7 @@ pub(super) fn bash_token_style(kind: &str) -> Option<Style> {
/// Formats TOML content with syntax highlighting using synoptic
pub fn format_toml(content: &str, left_margin: &str) -> String {
// Gutter style: subtle background for visual separation
- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));
+ let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
// Get TOML highlighter from synoptic's built-in rules (tab_width = 4)
let mut highlighter = match from_extension("toml", 4) {
diff --git a/src/styling/mod.rs b/src/styling/mod.rs
index 249428d7d..959cb68e1 100644
--- a/src/styling/mod.rs
+++ b/src/styling/mod.rs
@@ -124,10 +124,10 @@ command = "npm install"
"Should contain cyan or bold for tables"
);
- // Check that gutter background is present (Black background = 40)
+ // Check that gutter background is present (BrightBlack background = 100)
assert!(
- output.contains("\x1b[40m"),
- "Should contain gutter background color (Black = 40)"
+ output.contains("\x1b[100m"),
+ "Should contain gutter background color (BrightBlack = 100)"
);
// Check that lines have content (not just gutter)
@@ -293,8 +293,8 @@ command = "npm install"
// Each line should have the gutter
for line in result.lines() {
assert!(
- line.contains("\x1b[40m"),
- "Each line should contain gutter (Black background = 40)"
+ line.contains("\x1b[100m"),
+ "Each line should contain gutter (BrightBlack background = 100)"
);
}
}
@@ -322,11 +322,11 @@ command = "npm install"
let result = format_with_gutter(commit_msg, "", Some(80));
insta::assert_snapshot!(result, @r"
-   This commit refactors the authentication system to use a more secure
-   token-based approach instead of the previous session-based system which had
-   several security vulnerabilities that were identified during the security
-   audit last month. The new implementation follows industry best practices and
-   includes proper token rotation and expiration handling.
+   This commit refactors the authentication system to use a more secure
+   token-based approach instead of the previous session-based system which had
+   several security vulnerabilities that were identified during the security
+   audit last month. The new implementation follows industry best practices and
+   includes proper token rotation and expiration handling.
");
}
diff --git a/tests/integration_tests/config_list.rs b/tests/integration_tests/config_list.rs
index 7e1044b69..5ec7b58b6 100644
--- a/tests/integration_tests/config_list.rs
+++ b/tests/integration_tests/config_list.rs
@@ -51,17 +51,17 @@ server = "npm run dev"
exit_code: 0
----- stdout -----
⚪ Global Config: ~/.config/worktrunk/config.toml
-   worktree-path = "../{{ main_worktree }}.{{ branch }}"
-  
-   [[approved-commands]]
-   project = "test-project"
-   command = "npm install"
+   worktree-path = "../{{ main_worktree }}.{{ branch }}"
+  
+   [[approved-commands]]
+   project = "test-project"
+   command = "npm install"
⚪ Project Config: [REPO]/.config/wt.toml
-   post-create-command = "npm install"
-  
-   [post-start-command]
-   server = "npm run dev"
+   post-create-command = "npm install"
+  
+   [post-start-command]
+   server = "npm run dev"
----- stderr -----
"#);
@@ -96,7 +96,7 @@ fn test_config_list_no_project_config() {
exit_code: 0
----- stdout -----
⚪ Global Config: ~/.config/worktrunk/config.toml
-   worktree-path = "../{{ main_worktree }}.{{ branch }}"
+   worktree-path = "../{{ main_worktree }}.{{ branch }}"
⚪ Project Config: [REPO]/.config/wt.toml
💡 Not found
@@ -133,7 +133,7 @@ fn test_config_list_outside_git_repo() {
exit_code: 0
----- stdout -----
⚪ Global Config: ~/.config/worktrunk/config.toml
-   worktree-path = "../{{ main_worktree }}.{{ branch }}"
+   worktree-path = "../{{ main_worktree }}.{{ branch }}"
⚪ Project Config: Not in a git repository
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index d43766709..34e4f4449 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -29,7 +29,7 @@ fn test_configure_shell_with_yes() {
exit_code: 0
----- stdout -----
✅ Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
✅ Configured 1 shell
@@ -71,7 +71,7 @@ fn test_configure_shell_specific_shell() {
exit_code: 0
----- stdout -----
✅ Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
✅ Configured 1 shell
@@ -151,7 +151,7 @@ fn test_configure_shell_fish() {
exit_code: 0
----- stdout -----
✅ Created fish ~/.config/fish/conf.d/wt.fish
-   if type -q wt; command wt config shell init fish | source; end
+   if type -q wt; command wt config shell init fish | source; end
✅ Configured 1 shell
@@ -235,9 +235,9 @@ fn test_configure_shell_multiple_configs() {
exit_code: 0
----- stdout -----
✅ Added bash ~/.bash_profile
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
✅ Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
✅ Configured 2 shells
@@ -295,9 +295,9 @@ fn test_configure_shell_mixed_states() {
exit_code: 0
----- stdout -----
⚪ Already configured bash ~/.bash_profile
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
✅ Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
✅ Configured 1 shell
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 1e59adcdb..dd70d9a37 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -30,7 +30,7 @@ fn test_switch_internal_directive() {
----- stderr -----
❌ Failed to create worktree for my-feature
-   fatal: invalid reference: my-feature
+   fatal: invalid reference: my-feature
");
});
}
@@ -56,7 +56,7 @@ fn test_switch_without_internal() {
exit_code: 1
----- stdout -----
❌ Failed to create worktree for my-feature
-   fatal: invalid reference: my-feature
+   fatal: invalid reference: my-feature
----- stderr -----
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 33e3e5e75..bb2c6f76c 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2353,9 +2353,9 @@ fn test_merge_no_commit_with_clean_tree() {
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-   * [SHA] (HEAD -> feature) Add feature file
-   feature.txt | 1 +
-   1 file changed, 1 insertion(+)
+   * [SHA] (HEAD -> feature) Add feature file
+   feature.txt | 1 +
+   1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
✅ Worktree preserved (--no-remove)
@@ -2457,9 +2457,9 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-   * [SHA] (HEAD -> feature) Add feature file
-   feature.txt | 1 +
-   1 file changed, 1 insertion(+)
+   * [SHA] (HEAD -> feature) Add feature file
+   feature.txt | 1 +
+   1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
✅ Worktree preserved (--no-remove)
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 d4fc166ca..d38c4af36 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
@@ -7,11 +7,11 @@ y
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test command'
+  echo 'test command'
💡 Allow and remember? [y/N]
🔄 Running post-create:
-  echo 'test command'
+  echo 'test command'
test command
✅ Created new worktree for test-approve from main at [REPO]/test-repo.test-approve
💡 To enable automatic cd, run: wt config shell install
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 64fc94adf..b3da09abc 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
@@ -7,7 +7,7 @@ n
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test command'
+  echo 'test command'
💡 Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
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 8192277de..a1ecb5dde 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
@@ -7,20 +7,20 @@ y
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
-  echo 'First command'
+  echo 'First command'
🔄 post-create:
-  echo 'Third command'
+  echo 'Third command'
💡 Allow and remember? [y/N]
🔄 Running post-create:
-  echo 'First command'
+  echo 'First command'
First command
🔄 Running post-create:
-  echo 'Second command'
+  echo 'Second command'
Second command
🔄 Running post-create:
-  echo 'Third command'
+  echo 'Third command'
Third command
✅ Created new worktree for test-mixed-accept from main at [REPO]/test-repo.test-mixed-accept
💡 To enable automatic cd, run: wt config shell install
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 be88576f8..afabcc20d 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
@@ -7,10 +7,10 @@ n
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
-  echo 'First command'
+  echo 'First command'
🔄 post-create:
-  echo 'Third command'
+  echo 'Third command'
💡 Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
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 834dc1763..d98cd9cd1 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
@@ -7,23 +7,23 @@ y
🟡 test-repo needs approval to execute 3 commands:
🔄 post-create:
-  echo 'First command'
+  echo 'First command'
🔄 post-create:
-  echo 'Second command'
+  echo 'Second command'
🔄 post-create:
-  echo 'Third command'
+  echo 'Third command'
💡 Allow and remember? [y/N]
🔄 Running post-create:
-  echo 'First command'
+  echo 'First command'
First command
🔄 Running post-create:
-  echo 'Second command'
+  echo 'Second command'
Second command
🔄 Running post-create:
-  echo 'Third command'
+  echo 'Third command'
Third command
✅ Created new worktree for test-multi from main at [REPO]/test-repo.test-multi
💡 To enable automatic cd, run: wt config shell install
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 3ac0a17b9..49f5daa8c 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
@@ -7,23 +7,23 @@ y
🟡 test-repo needs approval to execute 3 commands:
🔄 post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
🔄 post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
🔄 post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
💡 Allow and remember? [y/N]
🔄 Running post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
🔄 Running post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
🔄 Running post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
Running tests...
✅ Created new worktree for test-named from main at [REPO]/test-repo.test-named
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 7594d66ed..f65a005f4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -7,13 +7,13 @@ y
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test command'
+  echo 'test command'
💡 Allow and remember? [y/N]
🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
💡 You will be prompted again next time.
🔄 Running post-create:
-  echo 'test command'
+  echo 'test command'
test command
✅ Created new worktree for test-permission from main at [REPO]/test-repo.test-permission
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index fb66daf72..25ef7fc32 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -4,7 +4,7 @@ expression: output.normalized()
---
✅ Created new worktree for fish-multiline from main at [TMPDIR]/test-repo.fish-multiline
🔄 Executing (--execute):
-  echo 'line 1'; echo 'line 2'; echo 'line 3'
+  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
line 3
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index fc1a6443a..a7e4fef38 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -4,4 +4,4 @@ expression: output.normalized()
---
✅ Created new worktree for fish-bg from main at [TMPDIR]/test-repo.fish-bg
🔄 Running post-start:
-  echo 'fish background task'
+  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 454e0b2f9..6301918d7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
🔄 Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
@@ -23,9 +23,9 @@ expression: output.normalized()
[check2] stdout complete
[check2] stderr complete
🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
-  * [HASH] (HEAD -> feature) Add feature
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [HASH] (HEAD -> feature) Add feature
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 454e0b2f9..6301918d7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
🔄 Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
@@ -23,9 +23,9 @@ expression: output.normalized()
[check2] stdout complete
[check2] stderr complete
🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
-  * [HASH] (HEAD -> feature) Add feature
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [HASH] (HEAD -> feature) Add feature
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 1926e0a7c..230f38b43 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge format:
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
🔄 Running pre-merge test:
-  echo '✗ Test suite failed: 3 tests failing' && exit 1
+  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index 1926e0a7c..230f38b43 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge format:
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
🔄 Running pre-merge test:
-  echo '✗ Test suite failed: 3 tests failing' && exit 1
+  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index daec8ec9d..4b9968b16 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -3,18 +3,18 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge format:
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
🔄 Running pre-merge lint:
-  echo '✓ Linting passed - no warnings'
+  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
🔄 Running pre-merge test:
-  echo '✓ All 47 tests passed in 2.3s'
+  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
-  * [HASH] (HEAD -> feature) Add feature
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [HASH] (HEAD -> feature) Add feature
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index daec8ec9d..4b9968b16 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -3,18 +3,18 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running pre-merge format:
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
🔄 Running pre-merge lint:
-  echo '✓ Linting passed - no warnings'
+  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
🔄 Running pre-merge test:
-  echo '✓ All 47 tests passed in 2.3s'
+  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
-  * [HASH] (HEAD -> feature) Add feature
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [HASH] (HEAD -> feature) Add feature
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 4aca34336..9e437d00e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -4,5 +4,5 @@ expression: output.normalized()
---
✅ Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
🔄 Executing (--execute):
-  echo executed
+  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 4aca34336..9e437d00e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -4,5 +4,5 @@ expression: output.normalized()
---
✅ Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
🔄 Executing (--execute):
-  echo executed
+  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 52a8a11b4..e1e559770 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -3,13 +3,13 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
🔄 Running post-create:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
🔄 Running post-create:
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
✅ Created new worktree for feature-hooks from main at [TMPDIR]/test-repo.feature-hooks
🔄 Running post-start server:
-  echo 'Starting dev server on port 3000'
+  echo 'Starting dev server on port 3000'
🔄 Running post-start watch:
-  echo 'Watching for file changes'
+  echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 105d7340a..e58fd1b98 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -4,4 +4,4 @@ expression: output.normalized()
---
✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/test-repo.feature-with-hooks
🔄 Running post-start:
-  echo 'test command executed'
+  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index fee4602a9..68dbd9ae4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -4,4 +4,4 @@ expression: output.normalized()
---
✅ Created new worktree for feature-bg from main at [TMPDIR]/test-repo.feature-bg
🔄 Running post-start:
-  echo 'background task'
+  echo 'background task'
diff --git a/tests/snapshots/git_error_display__push_failed.snap b/tests/snapshots/git_error_display__push_failed.snap
index 09c89630a..9a1d7fd1b 100644
--- a/tests/snapshots/git_error_display__push_failed.snap
+++ b/tests/snapshots/git_error_display__push_failed.snap
@@ -1,8 +1,8 @@
---
source: tests/git_error_display.rs
-expression: err.to_string()
+expression: msg
---
❌ Push failed
-  To /Users/user/workspace/repo/.git
-  ! [remote rejected] HEAD -> main (Up-to-date check failed)
-  error: failed to push some refs to '/Users/user/workspace/repo/.git'
+  To /Users/user/workspace/repo/.git
+  ! [remote rejected] HEAD -> main (Up-to-date check failed)
+  error: failed to push some refs to '/Users/user/workspace/repo/.git'
diff --git a/tests/snapshots/git_error_display__worktree_removal_failed.snap b/tests/snapshots/git_error_display__worktree_removal_failed.snap
index bb23044d2..f42e25423 100644
--- a/tests/snapshots/git_error_display__worktree_removal_failed.snap
+++ b/tests/snapshots/git_error_display__worktree_removal_failed.snap
@@ -1,7 +1,7 @@
---
source: tests/git_error_display.rs
-expression: err.to_string()
+expression: msg
---
❌ Failed to remove worktree for feature-x at /tmp/repo.feature-x
-  fatal: worktree is dirty
-  error: could not remove worktree
+  fatal: worktree is dirty
+  error: could not remove worktree
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 8c066282c..1756d5a60 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -26,7 +26,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'approved' > output.txt
+  echo 'approved' > output.txt
✅ Created new worktree for test-approved from main at [REPO].test-approved
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 45ecb9623..380a7e992 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -30,4 +33,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test command'
+  echo 'test command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index 5f96bab7a..4e3334ec4 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -12,7 +12,7 @@ exit_code: 1
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
-  echo 'First command'
+  echo 'First command'
🔄 post-create:
-  echo 'Third command'
+  echo 'Third command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index c04317e85..258dd5c5d 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -12,13 +12,13 @@ exit_code: 1
🟡 test-repo needs approval to execute 4 commands:
🔄 post-create:
-  echo 'Branch: test-nested-branch'
+  echo 'Branch: test-nested-branch'
🔄 post-create:
-  echo 'Worktree: [REPO].test-nested-branch'
+  echo 'Worktree: [REPO].test-nested-branch'
🔄 post-create:
-  echo 'Repo: test-repo'
+  echo 'Repo: test-repo'
🔄 post-create:
-  cd [REPO].test-nested-branch && pwd
+  cd [REPO].test-nested-branch && pwd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 0bbf242cf..317fd0644 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -12,10 +12,10 @@ exit_code: 1
🟡 test-repo needs approval to execute 3 commands:
🔄 post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
🔄 post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
🔄 post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 7b3e3a357..6e5070248 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'Worktree path: [REPO].feature-test-approval'
+  echo 'Worktree path: [REPO].feature-test-approval'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index 5f96bab7a..4e3334ec4 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -12,7 +12,7 @@ exit_code: 1
🟡 test-repo needs approval to execute 2 commands:
🔄 post-create:
-  echo 'First command'
+  echo 'First command'
🔄 post-create:
-  echo 'Third command'
+  echo 'Third command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index b30ee77fe..6a86a927b 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
@@ -27,7 +27,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'test command'
+  echo 'test command'
✅ Created new worktree for test-force-tty from main at [REPO].test-force-tty
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 85b94c8e2..e30c6cb0e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -27,7 +27,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'test command' > output.txt
+  echo 'test command' > output.txt
✅ Created new worktree for test-force from main at [REPO].test-force
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index 7dcec368c..d2903d6b7 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test command' > output.txt
+  echo 'test command' > output.txt
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index 5067f7544..4c30b3f73 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 post-merge:
-  echo 'Post-merge cleanup for main'
+  echo 'Post-merge cleanup for main'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 5fac643c8..352a81df2 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 pre-merge:
-  echo 'Running pre-merge checks on main'
+  echo 'Running pre-merge checks on main'
diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
index 91ed1ee5d..86bbbcfd8 100644
--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -30,4 +33,4 @@ exit_code: 1
🟡 test-repo needs approval to execute 1 command:
🔄 post-create:
-  echo 'test'
+  echo 'test'
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index b01f848db..76521ea23 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -12,13 +12,16 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ 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: "[TEST_CONFIG]"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5cKHXH/test-config.toml
---
success: true
exit_code: 0
@@ -26,8 +29,8 @@ exit_code: 0
----- stderr -----
🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * 6551244 (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
✅ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 31dd4940c..1512e7049 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap
index 48a96efa5..d357dd65b 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
HOME: "[TEST_HOME]"
LANG: C
@@ -25,7 +28,7 @@ success: true
exit_code: 0
----- stdout -----
⚪ Global Config: ~/.config/worktrunk/config.toml
-  worktree-path = "../{{ main_worktree }}.{{ branch }}"
+  worktree-path = "../{{ main_worktree }}.{{ branch }}"
⚪ Project Config: [REPO]/.config/wt.toml
💡 Not found
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 760dc1c15..1ca42893d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,18 +29,18 @@ exit_code: 0
🔄 Squashing 2 commits with working tree changes into 1 (2 files, +2)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
-  - feat: add file 2
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
+  - feat: add file 2
💡 Backup created @ [SHA]
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  file1.txt | 1 +
-  file2.txt | 1 +
-  2 files changed, 2 insertions(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 68af6f53b..7602bf6c6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,16 +27,16 @@ exit_code: 0
🔄 Squashing 1 commit with working tree changes into 1 (1 file, +1)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: initial feature
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: initial feature
💡 Backup created @ [SHA]
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index b2cde3f46..2bd980f07 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,16 +29,16 @@ exit_code: 0
🔄 Squashing 1 commit with working tree changes into 1 (1 file, +1)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add authentication
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add authentication
💡 Backup created @ [SHA]
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  auth.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  auth.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index f294dfe9e..06653c697 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,15 +25,15 @@ success: true
exit_code: 0
----- stdout -----
🟡 Auto-staging 1 untracked file:
-  dirty.txt
+  dirty.txt
🔄 Committing with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Changes to dirty.txt
+  Changes to dirty.txt
✅ Committed changes @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Changes to dirty.txt
-  dirty.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Changes to dirty.txt
+  dirty.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 62537094f..8ed0bbe1f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 0fba8a9dd..3731ad5fc 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,15 +25,15 @@ success: true
exit_code: 0
----- stdout -----
🟡 Auto-staging 1 untracked file:
-  newfile.txt
+  newfile.txt
🔄 Committing with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Changes to newfile.txt
+  Changes to newfile.txt
✅ Committed changes @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
-  newfile.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
+  newfile.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for no-commits-dirty, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 3d8d23830..106056464 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -24,9 +24,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index fb6729e33..6e405cfa6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,11 +26,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) feat: add file 2
-  * [SHA] feat: add file 1
-  file1.txt | 1 +
-  file2.txt | 1 +
-  2 files changed, 2 insertions(+)
+  * [SHA] (HEAD -> feature) feat: add file 2
+  * [SHA] feat: add file 1
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
✅ Merged to main (2 commits, 2 files, +2)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 62537094f..8ed0bbe1f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 3698868c3..854bd7f7e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,14 +26,14 @@ success: false
exit_code: 1
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
🔄 Running post-merge:
-  exit 1
+  exit 1
🟡 Command failed: exit status: 1
❌ post-merge command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 487a2e935..aea30f2db 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,16 +26,16 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
🔄 Running post-merge notify:
-  echo 'Merge to main complete' > notify.txt
+  echo 'Merge to main complete' > notify.txt
🔄 Running post-merge deploy:
-  echo 'Deploying branch feature' > deploy.txt
+  echo 'Deploying branch feature' > deploy.txt
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index fac278e35..799eb3757 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -12,8 +12,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,9 +27,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 4d0902b03..6a4ddf774 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,14 +26,14 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
🔄 Running post-merge:
-  echo 'merged feature to main' > post-merge-ran.txt
+  echo 'merged feature to main' > post-merge-ran.txt
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 37ea632d5..90df9faf1 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,9 +26,9 @@ success: false
exit_code: 1
----- stdout -----
🟡 Auto-staging 1 untracked file:
-  feature.txt
+  feature.txt
🔄 Running pre-commit:
-  exit 1
+  exit 1
❌ pre-commit command failed: exit status: 1
💡 Use --no-verify to skip pre-commit commands
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 2e7d4ac97..cf3be86a3 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
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,17 +26,17 @@ success: true
exit_code: 0
----- stdout -----
🟡 Auto-staging 1 untracked file:
-  feature.txt
+  feature.txt
🔄 Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
🔄 Committing with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Changes to feature.txt
+  Changes to feature.txt
✅ Committed changes @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Changes to feature.txt
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Changes to feature.txt
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 4612acdd6..d7f23b4a9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,7 +26,7 @@ success: false
exit_code: 1
----- stdout -----
🔄 Running pre-merge:
-  exit 1
+  exit 1
❌ pre-merge command failed: exit status: 1
💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 327ca6a87..66d72206f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,15 +26,15 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running pre-merge format:
-  exit 0
+  exit 0
🔄 Running pre-merge lint:
-  exit 0
+  exit 0
🔄 Running pre-merge test:
-  exit 0
+  exit 0
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 123d99be4..b7435d766 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,11 +26,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running pre-merge:
-  exit 0
+  exit 0
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index f818eb947..72196f837 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,7 +26,7 @@ success: false
exit_code: 1
----- stdout -----
🔄 Running pre-commit:
-  exit 1
+  exit 1
❌ pre-commit command failed: exit status: 1
💡 Use --no-verify to skip pre-commit commands
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 4425516bd..c51f003ca 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
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,11 +26,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index e34b67720..2397ff6ac 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature-from-develop) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature-from-develop) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature-from-develop, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index e39547638..78db84a9d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,9 +27,9 @@ exit_code: 0
🔄 Rebasing onto main...
✅ Rebased onto main
🔄 Merging 1 commit to main @ [SHA] (no commit/squash needed)
-  * [SHA] (HEAD -> feature-dirty-primary) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature-dirty-primary) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature-dirty-primary, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 2d1311247..eb30c0b48 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
✅ Worktree preserved (--no-remove)
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 5a05429b7..19e400616 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -26,9 +26,9 @@ exit_code: 1
----- stdout -----
🔄 Rebasing onto main...
❌ Rebase onto main incomplete
-  Rebasing (1/1)
-  error: could not apply [SHA]... Update shared.txt in feature
-  Could not apply [SHA]... # Update shared.txt in feature
+  Rebasing (1/1)
+  error: could not apply [SHA]... Update shared.txt in feature
+  Could not apply [SHA]... # Update shared.txt in feature
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 431f0eabe..edcdb1469 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,19 +27,19 @@ exit_code: 0
🔄 Squashing 3 commits into 1 (3 files, +3)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
-  - fix: update logic
-  - docs: update readme
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
+  - fix: update logic
+  - docs: update readme
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  file1.txt | 1 +
-  file2.txt | 1 +
-  file3.txt | 1 +
-  3 files changed, 3 insertions(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  file3.txt | 1 +
+  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index e621547e2..fe47610e6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,12 +27,12 @@ exit_code: 0
🔄 Squashing 3 commits into 1...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - Change 1
-  - Change 2
-  - Revert to initial
+  Squash commits from main
+ 
+  Combined commits:
+  - Change 1
+  - Change 2
+  - Revert to initial
⚪ No changes after squashing 3 commits
✅ Merged to main (no new commits, no rebase needed)
🔄 Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 85127effb..7eb97fb5c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -25,17 +28,17 @@ exit_code: 0
🔄 Squashing 2 commits into 1 (2 files, +2)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: new feature
-  - fix: bug fix
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: new feature
+  - fix: bug fix
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  file1.txt | 1 +
-  file2.txt | 1 +
-  2 files changed, 2 insertions(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 5961c45b1..133a5cf11 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) feat: single commit
-  file1.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) feat: single commit
+  file1.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index c491a2c79..981277dc3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -27,16 +30,16 @@ exit_code: 0
🔄 Squashing 2 commits into 1 (1 file, +1)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add authentication
-  - fix: handle edge case
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add authentication
+  - fix: handle edge case
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  auth.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  auth.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 886972ce7..e64cbca6e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,18 +29,18 @@ exit_code: 0
🔄 Squashing 2 commits with working tree changes into 1 (2 files, +2)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
-  - feat: add file 2
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
+  - feat: add file 2
💡 Backup created @ [SHA]
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  file1.txt | 1 +
-  file2.txt | 1 +
-  2 files changed, 2 insertions(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index fc03dcfd4..106056464 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -9,8 +9,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -21,9 +24,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index e63eb5b8d..a10e6d9dc 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,9 +27,9 @@ exit_code: 0
🔄 Rebasing onto staging...
✅ Rebased onto staging
🔄 Merging 1 commit to staging @ [SHA] (no commit/squash needed)
-  * [SHA] (HEAD -> feature-for-staging) Add feature for staging
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature-for-staging) Add feature for staging
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to staging (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature-for-staging, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index 122dd5c20..dbee827e0 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/merge.rs
-assertion_line: 12
info:
program: wt
args:
@@ -16,18 +15,19 @@ 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: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplZVJ0R/test-config.toml
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO].main-wt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 2d1311247..eb30c0b48 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
✅ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 717c7e4ea..c48f8b0da 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,23 +27,23 @@ success: true
exit_code: 0
----- stdout -----
🟡 Auto-staging 2 untracked files:
-  untracked1.txt
-  untracked2.txt
+  untracked1.txt
+  untracked2.txt
🔄 Squashing 1 commit with working tree changes into 1 (1 file, +1)...
🔄 Generating squash commit message...
💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
💡 Backup created @ [SHA]
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature) Squash commits from main
-  file1.txt | 1 +
-  untracked1.txt | 1 +
-  untracked2.txt | 1 +
-  3 files changed, 3 insertions(+)
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  untracked1.txt | 1 +
+  untracked2.txt | 1 +
+  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index a407a9f61..499ad0422 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -25,31 +28,31 @@ exit_code: 0
----- stdout -----
🔄 Squashing 3 commits into 1 (3 files, +33)...
🔄 Generating squash commit message...
-  feat(auth): Implement JWT authentication system
- 
-  Add comprehensive JWT token handling including validation, refresh logic,
-  and authentication tests. This establishes the foundation for secure
-  API authentication.
- 
-  - Implement token refresh mechanism with expiry handling
-  - Add JWT encoding/decoding with signature verification
-  - Create test suite covering all authentication flows
+  feat(auth): Implement JWT authentication system
+ 
+  Add comprehensive JWT token handling including validation, refresh logic,
+  and authentication tests. This establishes the foundation for secure
+  API authentication.
+ 
+  - Implement token refresh mechanism with expiry handling
+  - Add JWT encoding/decoding with signature verification
+  - Create test suite covering all authentication flows
✅ Squashed @ [SHA]
🔄 Running pre-merge test:
-  cargo test
+  cargo test
🔄 Running pre-merge lint:
-  cargo clippy
+  cargo clippy
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
-  auth.rs | 8 ++++++++
-  auth_test.rs | 17 +++++++++++++++++
-  jwt.rs | 8 ++++++++
-  3 files changed, 33 insertions(+)
+  * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
+  auth.rs | 8 ++++++++
+  auth_test.rs | 17 +++++++++++++++++
+  jwt.rs | 8 ++++++++
+  3 files changed, 33 insertions(+)
✅ Merged to main (1 commit, 3 files, +33)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature-auth, changed directory to [REPO]
🔄 Running post-merge install:
-  cargo install --path .
+  cargo install --path .
----- stderr -----
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index e191cfb9b..0ac35a9f7 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
@@ -28,11 +28,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create install:
-  uv sync
+  uv sync
✅ Created new worktree for feature-x from main at [REPO].feature-x
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start dev:
-  uv run dev
+  uv run dev
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index 50c9c1e93..2ff241503 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -25,20 +28,20 @@ exit_code: 0
----- stdout -----
🔄 Squashing 3 commits into 1 (2 files, +45)...
🔄 Generating squash commit message...
-  feat(api): Add user authentication endpoints
- 
-  Implement login and token refresh endpoints with JWT validation.
-  Includes comprehensive test coverage and input validation.
+  feat(api): Add user authentication endpoints
+ 
+  Implement login and token refresh endpoints with JWT validation.
+  Includes comprehensive test coverage and input validation.
✅ Squashed @ [SHA]
🔄 Running pre-merge test:
-  uv run pytest
+  uv run pytest
🔄 Running pre-merge lint:
-  uv run ruff check
+  uv run ruff check
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-  * [SHA] (HEAD -> feature-auth) feat(api): Add user authentication endpoints
-  api/auth.py | 31 +++++++++++++++++++++++++++++++
-  tests/test_auth.py | 14 ++++++++++++++
-  2 files changed, 45 insertions(+)
+  * [SHA] (HEAD -> feature-auth) feat(api): Add user authentication endpoints
+  api/auth.py | 31 +++++++++++++++++++++++++++++++
+  tests/test_auth.py | 14 ++++++++++++++
+  2 files changed, 45 insertions(+)
✅ Merged to main (1 commit, 2 files, +45)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for feature-auth, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 50a6158b0..eb39590e5 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] (HEAD -> fix-auth) Implement JWT validation
-  auth.rs | 13 +++++++++++++
-  1 file changed, 13 insertions(+)
+  * [SHA] (HEAD -> fix-auth) Implement JWT validation
+  auth.rs | 13 +++++++++++++
+  1 file changed, 13 insertions(+)
✅ Merged to main (1 commit, 1 file, +13)
🔄 Removing worktree & branch...
✅ Removed worktree & branch for fix-auth, changed directory to [REPO]
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index dd2f069da..1fb4b16f0 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -26,11 +26,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'Setup done' > setup.txt
+  echo 'Setup done' > setup.txt
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start server:
-  sleep 0.05 && echo 'Server running' > server.txt
+  sleep 0.05 && echo 'Server running' > server.txt
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index e4e36eefe..569a1e943 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -13,8 +13,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,8 +29,8 @@ exit_code: 0
----- stdout -----
✅ Created new worktree for feature from main at [REPO].feature
🔄 Running post-start:
-  echo 'Background task' > background.txt
+  echo 'Background task' > background.txt
🔄 Executing (--execute):
-  echo 'Execute flag' > execute.txt
+  echo 'Execute flag' > execute.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 0aff76226..2b2545359 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -26,7 +26,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  exit 1
+  exit 1
🟡 Command failed: exit status: 1
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index ccdcdd18c..890a846e9 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -26,11 +26,11 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  if [ ! -f test.txt ]; then
-  echo 'File does not exist' > result.txt
-  else
-  echo 'File exists' > result.txt
-  fi
+  if [ ! -f test.txt ]; then
+  echo 'File does not exist' > result.txt
+  else
+  echo 'File exists' > result.txt
+  fi
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
index 95eab3689..439d68eed 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -26,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'First'
+  echo 'First'
🔄 Running post-create:
-  echo 'Second'
+  echo 'Second'
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 7928b9656..c26842926 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -26,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create install:
-  echo 'Installing deps'
+  echo 'Installing deps'
🔄 Running post-create setup:
-  echo 'Running setup'
+  echo 'Running setup'
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 704cc8a70..5f8da46e4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -26,7 +26,7 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'Setup complete'
+  echo 'Setup complete'
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 298ad45dd..74177b23f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -26,13 +26,13 @@ success: true
exit_code: 0
----- stdout -----
🔄 Running post-create:
-  echo 'Repo: test-repo' > info.txt
+  echo 'Repo: test-repo' > info.txt
🔄 Running post-create:
-  echo 'Branch: feature-test' >> info.txt
+  echo 'Branch: feature-test' >> info.txt
🔄 Running post-create:
-  echo 'Worktree: [REPO].feature-test' >> info.txt
+  echo 'Worktree: [REPO].feature-test' >> info.txt
🔄 Running post-create:
-  echo 'Root: [REPO]' >> info.txt
+  echo 'Root: [REPO]' >> info.txt
✅ Created new worktree for feature/test from main at [REPO].feature-test
💡 To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index 6a5255cbc..48b1044d4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -28,8 +28,8 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  echo 'line1
-  line2
-  line3' | grep line2 > filtered.txt
+  echo 'line1
+  line2
+  line3' | grep line2 > filtered.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index 796f46032..4b4b52077 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -28,6 +28,6 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  echo 'POST-START-RAN' > post_start_marker.txt
+  echo 'POST-START-RAN' > post_start_marker.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index 0d50b8a6d..2d58cbbc8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -28,6 +28,6 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  echo 'unclosed quote
+  echo 'unclosed quote
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 54ecf4abb..d713ff08f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -28,6 +28,6 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  echo 'stdout output' && echo 'stderr output' >&2
+  echo 'stdout output' && echo 'stderr output' >&2
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index de78cd1a4..0f58375f3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -28,8 +28,8 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  echo 'first line' > multiline.txt
-  echo 'second line' >> multiline.txt
-  echo 'third line' >> multiline.txt
+  echo 'first line' > multiline.txt
+  echo 'second line' >> multiline.txt
+  echo 'third line' >> multiline.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index 1229e3f30..6944596b3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -28,8 +28,8 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start task1:
-  echo 'Task 1 running' > task1.txt
+  echo 'Task 1 running' > task1.txt
🔄 Running post-start task2:
-  echo 'Task 2 running' > task2.txt
+  echo 'Task 2 running' > task2.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index d22b734de..2d1202824 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -28,10 +28,10 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start task1:
-  echo 'TASK1_OUTPUT'
+  echo 'TASK1_OUTPUT'
🔄 Running post-start task2:
-  echo 'TASK2_OUTPUT'
+  echo 'TASK2_OUTPUT'
🔄 Running post-start task3:
-  echo 'TASK3_OUTPUT'
+  echo 'TASK3_OUTPUT'
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index b52ab8bb9..25e395fb2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -28,6 +28,6 @@ exit_code: 0
✅ Created new worktree for feature from main at [REPO].feature
💡 To enable automatic cd, run: wt config shell install
🔄 Running post-start:
-  sleep 0.1 && echo 'Background task done' > background.txt
+  sleep 0.1 && echo 'Background task done' > background.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index ff9d90269..555d3b7c7 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,9 +27,9 @@ exit_code: 0
----- stdout -----
🔄 Stashing changes in [REPO]...
🔄 Pushing 1 commit to main @ [SHA]
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
🔄 Restoring stashed changes in [REPO]...
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
index 87d498059..bd03022f4 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,7 +27,7 @@ exit_code: 1
----- stdout -----
❌ Cannot push: conflicting uncommitted changes in:
-  conflict.txt
+  conflict.txt
💡 Commit or stash these changes in [REPO] first
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index f84b1f721..53f7c21cd 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Pushing 1 commit to main @ [SHA]
-  * [SHA] (HEAD -> feature) Add test file
-  test.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add test file
+  test.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 8da9736e5..9acc7d5d5 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -25,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Pushing 1 commit to main @ [SHA]
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index f82454726..821b2a922 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -11,8 +11,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -23,9 +26,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Pushing 1 commit to main @ [SHA]
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index d24671491..9acc7d5d5 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -10,8 +10,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -22,9 +25,9 @@ success: true
exit_code: 0
----- stdout -----
🔄 Pushing 1 commit to main @ [SHA]
-  * [SHA] (HEAD -> feature) Add feature file
-  feature.txt | 1 +
-  1 file changed, 1 insertion(+)
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index ad62ba23e..d193c186b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -12,8 +12,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -24,14 +27,14 @@ success: true
exit_code: 0
----- stdout -----
🔄 Pushing 3 commits to main @ [SHA] (merge commits allowed)
-  * [SHA] (HEAD -> feature) Merge temp
-  |/
-  | * [SHA] (temp) Commit 2
-  |/
-  * [SHA] Commit 1
-  file1.txt | 1 +
-  file2.txt | 1 +
-  2 files changed, 2 insertions(+)
+  * [SHA] (HEAD -> feature) Merge temp
+  |/
+  | * [SHA] (temp) Commit 2
+  |/
+  * [SHA] Commit 1
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
✅ Pushed to main (3 commits, 2 files, +2)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
index 88e46debb..a20cc5c06 100644
--- a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
@@ -11,13 +11,16 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ 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: "[TEST_CONFIG]"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGcODxo/test-config.toml
---
success: false
exit_code: 1
@@ -25,4 +28,4 @@ exit_code: 1
----- stderr -----
❌ Failed to create worktree for __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
-  fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
+  fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index 8f99d7357..907cd1705 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -13,8 +13,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,6 +29,6 @@ exit_code: 0
----- stdout -----
✅ Created new worktree for file-test from main at [REPO].file-test
🔄 Executing (--execute):
-  echo 'test content' > test.txt
+  echo 'test content' > test.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 93029fa5e..4933cd80c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -12,8 +12,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -25,6 +28,6 @@ exit_code: 0
----- stdout -----
✅ Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
🔄 Executing (--execute):
-  echo 'existing worktree' > existing.txt
+  echo 'existing worktree' > existing.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index cb938c9e5..56f9ac353 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -13,8 +13,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +29,7 @@ exit_code: 1
----- stdout -----
✅ Created new worktree for fail-test from main at [REPO].fail-test
🔄 Executing (--execute):
-  exit 1
+  exit 1
❌ exit status: 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 057eae5ec..85cda9315 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -13,8 +13,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,9 +29,9 @@ exit_code: 0
----- stdout -----
✅ Created new worktree for multiline-test from main at [REPO].multiline-test
🔄 Executing (--execute):
-  echo 'line1'
-  echo 'line2'
-  echo 'line3'
+  echo 'line1'
+  echo 'line2'
+  echo 'line3'
line1
line2
line3
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index abb1e0111..7c9c37734 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -13,8 +13,11 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_COUNT: "1"
GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_KEY_0: advice.mergeConflict
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_CONFIG_VALUE_0: "false"
GIT_EDITOR: ""
LANG: C
LC_ALL: C
@@ -26,7 +29,7 @@ exit_code: 0
----- stdout -----
✅ Created new worktree for exec-test from main at [REPO].exec-test
🔄 Executing (--execute):
-  echo 'test output'
+  echo 'test output'
test output
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index f9a5914ca..b95264d21 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap differ