Skip to content

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.md
index 43d012a85..3ebd3c49f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -129,7 +129,7 @@ println!("πŸ”„ {cyan}Rebasing onto main...{cyan:#}");
// Success
let 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 stdout
println!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 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 branch
let 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 worktree
let main_worktree_path = repo.main_worktree_root()?;
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 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.rs
index 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.snap
index 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
βœ… Already on main, nothing to merge
diff --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.snap
index 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
βœ… Already on main, nothing to merge
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 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command format:
  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.snap
index 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command format:
  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.snap
index 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command format:
  echo 'βœ“ Code formatting check passed'
@@ -19,14 +18,14 @@ expression: output.normalized().as_ref()
βœ“ All 47 tests passed in 2.3s
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ d067f01
+πŸ”„ Merging 1 commit to main @ d067f01
* d067f01 (HEAD -> feature) Add feature
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [TMPDIR]/test-repo
diff --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.snap
index 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.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command format:
  echo 'βœ“ Code formatting check passed'
@@ -19,13 +18,13 @@ expression: output.normalized().as_ref()
βœ“ All 47 tests passed in 2.3s
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ d067f01
+πŸ”„ Merging 1 commit to main @ d067f01
* d067f01 (HEAD -> feature) Add feature
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [TMPDIR]/test-repo
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap
index e0aa0d03e..458f64ea0 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap differ
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 9687be4ca..8f4b1482a 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__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
index 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:
- merge
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
@@ -14,12 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
βœ… Already on main, nothing to merge
----- 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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Committing uncommitted changes...
πŸ”„ Generating commit message...
  WIP: Auto-commit before merge
@@ -40,7 +40,7 @@ exit_code: 0
βœ… Squashed 3 commits into one
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Squash commits from main
@@ -48,7 +48,7 @@ exit_code: 0
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Pushed to main (1 commit, 2 files, +2) 
+βœ… Merged to main (1 commit, 2 files, +2) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [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 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:
- main
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
@@ -15,19 +16,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Committing uncommitted changes...
πŸ”„ Generating commit message...
  WIP: Auto-commit before merge
βœ… Committed changes
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 2 commits to main @ [SHA]
+πŸ”„ Merging 2 commits to main @ [SHA]
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
* [SHA] feat: initial feature
@@ -35,7 +35,7 @@ exit_code: 0
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (2 commits, 1 file, +1) 
+βœ… Merged to main (2 commits, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [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 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:
- main
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,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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Committing uncommitted changes...
πŸ”„ Generating commit message...
  WIP: Auto-commit before merge
βœ… Committed changes
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 2 commits to main @ [SHA]
+πŸ”„ Merging 2 commits to main @ [SHA]
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
* [SHA] feat: add authentication
@@ -37,7 +37,7 @@ exit_code: 0
auth.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (2 commits, 1 file, +1) 
+βœ… Merged to main (2 commits, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --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.snap
index 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 feature
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,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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Committing uncommitted changes...
πŸ”„ Generating commit message...
  WIP: Auto-commit before merge
βœ… Committed changes
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 2 commits to main @ [SHA]
+πŸ”„ Merging 2 commits to main @ [SHA]
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
* [SHA] feat: start feature
@@ -39,7 +39,7 @@ exit_code: 0
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (2 commits, 1 file, +1) 
+βœ… Merged to main (2 commits, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [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 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:
- main
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
@@ -15,26 +16,25 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Committing uncommitted changes...
πŸ”„ Generating commit message...
  WIP: Auto-commit before merge
βœ… Committed changes
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
dirty.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
index 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:
- main
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
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: false
exit_code: 1
----- stdout -----
-πŸ”„ Validating merge...
----- stderr -----
❌ Not on a branch (detached HEAD)
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 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:
- main
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
@@ -15,21 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 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:
- main
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
@@ -15,21 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Running post-merge command cmd:
  exit 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Running post-merge command deploy:
  echo 'Deploying branch feature' > deploy.txt
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Running post-merge command cmd:
  echo 'merged feature to main' > post-merge-ran.txt
diff --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.snap
index 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.rs
expression: output
---
Exit code: 0
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command first:
  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
@@ -15,14 +14,14 @@ STDERR-FROM-FIRST
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 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: C
LC_ALL: C
SOURCE_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: false
exit_code: 1
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command cmd:
  exit 1
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command format:
  exit 0
@@ -32,14 +32,14 @@ exit_code: 0
  exit 0
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2NpdwS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRrHqcZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command check1:
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
@@ -28,14 +29,14 @@ exit_code: 0
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Running pre-merge command cmd:
  exit 0
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 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:
- main
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
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: false
exit_code: 1
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
----- 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Squashing 3 commits into one...
πŸ”„ Generating squash commit message...
  Squash commits from main
@@ -33,7 +33,7 @@ exit_code: 0
βœ… Squashed 3 commits into one
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Squash commits from main
@@ -42,7 +42,7 @@ exit_code: 0
file3.txt | 1 +
3 files changed, 3 insertions(+)
-βœ… Pushed to main (1 commit, 3 files, +3) 
+βœ… Merged to main (1 commit, 3 files, +3) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
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 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: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Squashing 2 commits into one...
πŸ”„ Generating squash commit message...
  Squash commits from main
@@ -33,7 +33,7 @@ exit_code: 0
βœ… Squashed 2 commits into one
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Squash commits from main
@@ -41,7 +41,7 @@ exit_code: 0
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Pushed to main (1 commit, 2 files, +2) 
+βœ… Merged to main (1 commit, 2 files, +2) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) feat: single commit
file1.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Squashing 2 commits into one...
πŸ”„ Generating squash commit message...
  Squash commits from main
@@ -35,14 +35,14 @@ exit_code: 0
βœ… Squashed 2 commits into one
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Squash commits from main
auth.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 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:
- merge
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
@@ -14,21 +15,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-πŸ”„ Validating merge...
πŸ”„ Rebasing onto main...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA]
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1) 
+βœ… Merged to main (1 commit, 1 file, +1) 
βœ… Kept worktree (use 'wt remove' to clean up)