Skip to content

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

docs: Clarify linebreak usage for output functions

Maximilian Roos1f3fdfc658f6
diff --git a/CLAUDE.md b/CLAUDE.md
index b3807c38f..ec231dbcf 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -376,10 +376,20 @@ super::gutter(format_with_gutter(&error.to_string(), "", None))?; // Adds ❌ e
print!("{}", format_with_gutter(&command));
```
-**Linebreaks with gutter content:** Use a single newline (`\n`) between error messages and gutter content, never double newlines (`\n\n`). The gutter's visual structure (background color, indentation) provides sufficient separation - blank lines are redundant.
+**Linebreaks with gutter content:** Use a single newline (`\n`) between messages and gutter content, never double newlines (`\n\n`). The gutter's visual structure (background color, indentation) provides sufficient separation - blank lines are redundant.
+
+**Critical Rule**: Never include trailing `\n` in messages passed to `output::*()` functions - they use `println!()` which automatically adds the newline.
```rust
-// ✅ GOOD - single newline before gutter
+// ✅ GOOD - output function adds newline automatically
+output::progress(format!("{CYAN}Merging commits...{CYAN:#}"))?;
+output::gutter(format_with_gutter(&log_output, "", None))?;
+
+// ❌ BAD - trailing \n creates blank line (output::progress uses println!)
+output::progress(format!("{CYAN}Merging commits...{CYAN:#}\n"))?;
+output::gutter(format_with_gutter(&log_output, "", None))?;
+
+// ✅ GOOD - single newline in direct format!()
format!("{header}\n{}", format_with_gutter(error, "", None))
// ❌ BAD - double newline creates unnecessary blank line
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 1fd6ba269..dd0fb029d 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -596,7 +596,7 @@ pub fn handle_push(
};
crate::output::progress(format!(
- "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}\n"
+ "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}"
))?;
// Show the commit graph with color
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index bcf55abf2..b26c1b568 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2314,7 +2314,6 @@ 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(+)
@@ -2419,7 +2418,6 @@ 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(+)
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 8bdae401d..454e0b2f9 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
@@ -23,7 +23,6 @@ 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(+)
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 8bdae401d..454e0b2f9 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
@@ -23,7 +23,6 @@ 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(+)
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 5c1af77ec..daec8ec9d 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
@@ -12,7 +12,6 @@ expression: output.normalized()
  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(+)
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 5c1af77ec..daec8ec9d 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
@@ -12,7 +12,6 @@ expression: output.normalized()
  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(+)
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 5b71573e6..0d38ffe29 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
@@ -18,7 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSF53AK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYtxgYt/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,6 @@ 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(+)
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 ae7d32dfb..8eeea473a 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_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index c3f09d5ba..831334057 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
@@ -18,7 +18,7 @@ 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/.tmpvDIUwx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3G9xm6/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,6 @@ exit_code: 0
  - feat: add file 2
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
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 3c0b2421e..94abf895e 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVw44sM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmBRKrW/test-config.toml
---
success: true
exit_code: 0
@@ -30,7 +30,6 @@ exit_code: 0
  - feat: initial feature
✅ 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(+)
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 55fa001ae..283713cf9 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
@@ -18,7 +18,7 @@ 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/.tmpQrDAcA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKuqhlB/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,6 @@ exit_code: 0
  - feat: add authentication
✅ 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(+)
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 2ecb7949c..4e32b444e 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNk2Vkx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcdVWzk/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,6 @@ exit_code: 0
  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(+)
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 7e258b0c5..93f6837c7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0QBfBm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCUqHu5/test-config.toml
---
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(+)
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 4a9a60e8f..9210f12ea 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMGQMEy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQkhpyE/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,6 @@ exit_code: 0
  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(+)
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 d6b8d985c..a8a618738 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvNkMKB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnvXdfn/test-config.toml
---
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 +
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 fcea1b4aa..6bcddb115 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
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUQMOzG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8MCIOa/test-config.toml
---
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(+)
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 890c51c0a..f8ef6675b 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmjP1io/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOhJP95/test-config.toml
---
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(+)
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 b8f5a90da..319c7da7d 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcihcnx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2if5SL/test-config.toml
---
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(+)
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 be0a63180..781cec725 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
@@ -18,13 +18,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbO1jeF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTEOYrB/test-config.toml
---
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(+)
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 be5ab3d52..2f246697b 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7FRaV5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxKuZ0v/test-config.toml
---
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(+)
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 03cd79851..c52227292 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvtdLhK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzwuf0G/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,6 @@ exit_code: 0
  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(+)
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 6b984db04..513017e00 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6aktDv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw2ffLs/test-config.toml
---
success: true
exit_code: 0
@@ -29,7 +29,6 @@ exit_code: 0
🔄 Running pre-merge test:
  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(+)
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 ebe5eef14..2aebd8074 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoDPmOC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRAule3/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,6 @@ exit_code: 0
🔄 Running pre-merge:
  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(+)
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 bd9b260b3..bbb523c16 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbRfyYy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRqlQV7/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,6 @@ exit_code: 0
🔄 Running pre-commit:
  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(+)
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 f76ae399a..28d1bd203 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
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDt5Nqc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBseVI0/test-config.toml
---
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(+)
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 46050d1dc..621d2305e 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXhTLbu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdN12ap/test-config.toml
---
success: true
exit_code: 0
@@ -24,7 +24,6 @@ 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(+)
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 41d015839..60c08c460 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxCmHlV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzLrQoy/test-config.toml
---
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(+)
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 981defbb1..93ababa9b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphvQWkH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjjUDj8/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,6 @@ exit_code: 0
  - 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 +
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 ba4fc4bbe..e534f5163 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
@@ -17,7 +17,7 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjsJ0Qf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpObSpb8/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,6 @@ exit_code: 0
  - 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 +
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 1477e6158..ca19306e8 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
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpboIiiA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmWRxre/test-config.toml
---
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(+)
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 bd18eb234..42e9f4223 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
@@ -19,7 +19,7 @@ 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/.tmpOuLIpW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsfR67A/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,6 @@ exit_code: 0
  - 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(+)
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 a0513fc64..da6b93980 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,13 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphMDEpp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8BZLOD/test-config.toml
---
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(+)
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 c00b74364..529a75fc6 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsc94Ii/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGqUa5m/test-config.toml
---
success: true
exit_code: 0
@@ -24,7 +24,6 @@ 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(+)
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 ce493ad4a..620786633 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvKi7r5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbQurLe/test-config.toml
---
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(+)
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 b01ca0770..8874292c4 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
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9X1OmC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpy0kfgV/test-config.toml
---
success: true
exit_code: 0
@@ -35,7 +35,6 @@ exit_code: 0
  - feat: add file 1
✅ Squashed @ [SHA]
🔄 Merging 1 commit to main @ [SHA] (no rebase needed)
-
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
  untracked1.txt | 1 +
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 019f4ed83..f08cec2e1 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXhUJ6w/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM4iPix/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXhUJ6w/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM4iPix/test-config.toml
---
success: true
exit_code: 0
@@ -40,7 +40,6 @@ exit_code: 0
🔄 Running pre-merge lint:
  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 +++++++++++++++++
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 663f9f181..a78614606 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
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUTUBw4/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8g8RGF/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUTUBw4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8g8RGF/test-config.toml
---
success: true
exit_code: 0
@@ -35,7 +35,6 @@ exit_code: 0
🔄 Running pre-merge lint:
  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 ++++++++++++++
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 6efdcacbf..f03a668f9 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDqs41s/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsEDy0H/test-config.toml
---
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(+)
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 0e93bd6d1..73c8aad4c 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
@@ -13,17 +13,17 @@ info:
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/.tmpE1EiyT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH011FJ/test-config.toml
---
success: true
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(+)
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 c1cd4b69d..ec6afc0c0 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9lwhzS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVHwHJz/test-config.toml
---
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(+)
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 75ab9d601..a4418926a 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
@@ -17,13 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFzk5oq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVW6tah/test-config.toml
---
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(+)
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 3742b88bc..3055f6c74 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -16,13 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRuxKWq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkEU3ld/test-config.toml
---
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(+)
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 12c49ea33..92e540159 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
@@ -18,13 +18,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpApNe4v/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcuRQ7D/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🔄 Pushing 3 commits to main @ [SHA] (merge commits allowed)
-
  * [SHA] (HEAD -> feature) Merge temp
  |/
  | * [SHA] (temp) Commit 2