Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Use 'Merged to' in merge command success messages
Maximilian Roosb16334ebe5fe
diff --git a/CLAUDE.md b/CLAUDE.mdindex 43d012a85..3ebd3c49f 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -129,7 +129,7 @@ println!("π {cyan}Rebasing onto main...{cyan:#}");// Successlet green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));-println!("β {green}Pushed to main{green:#}");+println!("β {green}Merged to main{green:#}");// Error - ALL our output goes to stdoutprintln!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 106f5ed54..001969082 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -17,9 +17,6 @@ pub fn handle_merge() -> Result<(), GitError> {let repo = Repository::current();- // Show progress for initial validation- crate::output::progress(format!("π {CYAN}Validating merge...{CYAN:#}"))?;-// Get current branchlet current_branch = repo.current_branch()?.ok_or(GitError::DetachedHead)?;@@ -99,7 +96,7 @@ pub fn handle_merge(}// Fast-forward push to target branch (reuse handle_push logic)- handle_push(Some(&target_branch), false)?;+ handle_push(Some(&target_branch), false, "Merged to")?;// Execute post-merge commands in the main worktreelet main_worktree_path = repo.main_worktree_root()?;diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex ca96038a8..3b79777ce 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -507,7 +507,11 @@ fn spawn_post_start_commands(Ok(())}-pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<(), GitError> {+pub fn handle_push(+ target: Option<&str>,+ allow_merge_commits: bool,+ verb: &str,+) -> Result<(), GitError> {let repo = Repository::current();// Get target branch (default to default branch if not provided)@@ -554,8 +558,13 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()let head_sha = repo.run_command(&["rev-parse", "--short", "HEAD"])?;let head_sha = head_sha.trim();+ let verb_ing = if verb.starts_with("Merged") {+ "Merging"+ } else {+ "Pushing"+ };crate::output::progress(format!(- "π {CYAN}Pushing {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {head_sha}{CYAN:#}\n"+ "π {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {head_sha}{CYAN:#}\n"))?;// Show the commit graph with color@@ -620,12 +629,12 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()}crate::output::progress(format!(- "{SUCCESS_EMOJI} {GREEN}Pushed to {GREEN_BOLD}{target_branch}{GREEN_BOLD:#} ({}) {GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#} ({}) {GREEN:#}",summary_parts.join(", ")))?;} else {crate::output::progress(format!(- "{SUCCESS_EMOJI} {GREEN}Pushed to {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"))?;}diff --git a/src/main.rs b/src/main.rsindex ef1155758..4b463f487 100644--- a/src/main.rs+++ b/src/main.rs@@ -430,7 +430,7 @@ fn main() {Commands::Push {target,allow_merge_commits,- } => handle_push(target.as_deref(), allow_merge_commits),+ } => handle_push(target.as_deref(), allow_merge_commits, "Pushed to"),Commands::Merge {target,squash,diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_bash.snapindex a40888224..f0f2b867a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_bash.snap@@ -2,5 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mβ [32mAlready on [1m[32mmain[0m, nothing to merge[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_fish.snapindex a40888224..f0f2b867a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_fish.snap@@ -2,5 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mβ [32mAlready on [1m[32mmain[0m, nothing to merge[0mdiff --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.snapindex d438c6728..d79592646 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@@ -2,7 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m[40m [0m echo 'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snapindex d438c6728..d79592646 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap@@ -2,7 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m[40m [0m echo 'β Code formatting check passed'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.snapindex 8ffd4517b..28913557b 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@@ -2,7 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m[40m [0m echo 'β Code formatting check passed'@@ -19,14 +18,14 @@ expression: output.normalized().as_ref()β All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ d067f01[0m+π [36mMerging 1 commit to [1m[36mmain[0m @ d067f01[0m* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featurefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [TMPDIR]/test-repo[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snapindex 95365dfc9..a01344b86 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap@@ -2,7 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m[40m [0m echo 'β Code formatting check passed'@@ -19,13 +18,13 @@ expression: output.normalized().as_ref()β All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ d067f01[0m+π [36mMerging 1 commit to [1m[36mmain[0m @ d067f01[0m* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featurefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [TMPDIR]/test-repo[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snapindex e0aa0d03e..458f64ea0 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 9687be4ca..8f4b1482a 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 707caeb6f..d1bd9999b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap@@ -6,6 +6,7 @@ info:- mergeenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -14,12 +15,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpry7YzB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR6XD8f/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mβ [32mAlready on [1m[32mmain[0m, nothing to merge[0m----- stderr -----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.snapindex c9a502cd8..96cd67a72 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@@ -8,6 +8,7 @@ info:- "--squash"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -18,12 +19,11 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaHNW3y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplU2QSs/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mCommitting uncommitted changes...[0mπ [36mGenerating commit message...[0m[40m [0m [1mWIP: Auto-commit before merge[0m@@ -40,7 +40,7 @@ exit_code: 0β [32mSquashed 3 commits into one[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -48,7 +48,7 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 55eac9e79..0e42a0b04 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@@ -7,6 +7,7 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -15,19 +16,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMSvivk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiaLGjq/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mCommitting uncommitted changes...[0mπ [36mGenerating commit message...[0m[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 2 commits to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 2 commits to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge* [SHA] feat: initial feature@@ -35,7 +35,7 @@ exit_code: 0feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex 0b3879284..750e1b68c 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@@ -7,6 +7,7 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -17,19 +18,18 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP8g0uD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZDShBs/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mCommitting uncommitted changes...[0mπ [36mGenerating commit message...[0m[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 2 commits to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 2 commits to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge* [SHA] feat: add authentication@@ -37,7 +37,7 @@ exit_code: 0auth.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snapindex de3df7a07..5b52a8c67 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap@@ -9,6 +9,7 @@ info:- Complete the user dashboard featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -19,19 +20,18 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: complete user dashboard"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjPqhHL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTS5gdO/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mCommitting uncommitted changes...[0mπ [36mGenerating commit message...[0m[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 2 commits to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 2 commits to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge* [SHA] feat: start feature@@ -39,7 +39,7 @@ exit_code: 0feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 81a20e0cb..634695ea8 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@@ -7,6 +7,7 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -15,26 +16,25 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP0ZOvC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsTqLxz/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mCommitting uncommitted changes...[0mπ [36mGenerating commit message...[0m[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergedirty.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snapindex 14c48c5c8..74f63a1a1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap@@ -7,19 +7,20 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaibPVH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp40HU2R/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mValidating merge...[0m----- stderr -----β [31mNot on a branch (detached HEAD)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 7a4f6e52f..22a9c4618 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -7,6 +7,7 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -15,21 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpain9MD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMSxCO3/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 825962686..3ac89575f 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@@ -7,6 +7,7 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -15,21 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkCPNd9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV53u6s/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex dd946192d..273fa6c6e 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,21 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvr4A0A/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoxYPhM/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mRunning post-merge command [1m[36mcmd[0m:[0m[40m [0m exit 1diff --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.snapindex 2b4aef77f..0755d34b6 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,21 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9zQbld/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpINZPIC/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mRunning post-merge command [1m[36mdeploy[0m:[0m[40m [0m echo 'Deploying branch feature' > deploy.txtdiff --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.snapindex a12d1a5ad..33a6aee23 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,21 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGfl13l/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu3DzYp/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mRunning post-merge command [1m[36mcmd[0m:[0m[40m [0m echo 'merged feature to main' > post-merge-ran.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snapindex 0dc798304..30e5a9397 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap@@ -3,7 +3,6 @@ source: tests/integration_tests/merge.rsexpression: output---Exit code: 0-π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mfirst[0m:[0m[40m [0m echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2@@ -15,14 +14,14 @@ STDERR-FROM-FIRSTSTDOUT-FROM-SECONDSTDERR-FROM-SECONDπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 017a5f023..f8dfe8f86 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,12 +17,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbUwp56/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDcBPxK/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mcmd[0m:[0m[40m [0m exit 1diff --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.snapindex b270bd67e..e3b04396c 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,12 +17,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuRmft4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgwig2T/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m[40m [0m exit 0@@ -32,14 +32,14 @@ exit_code: 0[40m [0m exit 0π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex d1d29cab8..dd7241649 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -8,6 +8,7 @@ info:- "--no-hooks"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,21 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDx9JPT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFqDlWx/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex aa6566f93..c16892f10 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -8,19 +8,20 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2NpdwS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRrHqcZ/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mcheck1[0m:[0m[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3@@ -28,14 +29,14 @@ exit_code: 0[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex 20dd53854..6c724d3d9 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@@ -8,6 +8,7 @@ info:- "--force"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,24 +17,23 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJbeYaa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdERrAu/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRunning pre-merge command [1m[36mcmd[0m:[0m[40m [0m exit 0π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 80efb5815..ea92f7462 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -7,19 +7,20 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbwkRzv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprt2F7E/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 137f5ce37..91449dff0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -8,6 +8,7 @@ info:- "--squash"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,12 +17,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcZ44Pn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIyfZqM/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mSquashing 3 commits into one...[0mπ [36mGenerating squash commit message...[0m[40m [0m [1mSquash commits from main[0m@@ -33,7 +33,7 @@ exit_code: 0β [32mSquashed 3 commits into one[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -42,7 +42,7 @@ exit_code: 0file3.txt | 1 [32m+[m3 files changed, 3 insertions(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 3 files, [32m+3[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 3 files, [32m+3[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 9f551dbc9..e4bcf2de8 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@@ -8,6 +8,7 @@ info:- "--squash"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -17,12 +18,11 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVq5nlQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRAZbu4/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mSquashing 2 commits into one...[0mπ [36mGenerating squash commit message...[0m[40m [0m [1mSquash commits from main[0m@@ -33,7 +33,7 @@ exit_code: 0β [32mSquashed 2 commits into one[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -41,7 +41,7 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 57a59ba04..bdc346da7 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@@ -8,6 +8,7 @@ info:- "--squash"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,22 +17,21 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpldqUaM/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJHQMgc/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0m[2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commitfile1.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex f0559da37..b3706af1b 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@@ -8,6 +8,7 @@ info:- "--squash"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -19,12 +20,11 @@ info:WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"WORKTRUNK_COMMIT_GENERATION__COMMAND: sh- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6eJmzb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdEJOn8/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mSquashing 2 commits into one...[0mπ [36mGenerating squash commit message...[0m[40m [0m [1mSquash commits from main[0m@@ -35,14 +35,14 @@ exit_code: 0β [32mSquashed 2 commits into one[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from mainauth.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex ac475b047..26457aed1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -6,6 +6,7 @@ info:- mergeenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -14,21 +15,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQK5ylb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbRVLSV/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0mβ [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 7bb971f82..894f93695 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -8,6 +8,7 @@ info:- "--keep"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,21 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLRUw3v/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmHisFy/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mValidating merge...[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mβ [32mKept worktree (use 'wt remove' to clean up)[0m