Skip to content

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

feat: Distinguish commit messages and accept rebase snapshots

Maximilian Roosdc2aecd6d590
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index cdb408242..a496aa876 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -146,11 +146,11 @@ pub fn handle_dev_commit(force: bool, no_verify: bool) -> Result<(), GitError> {
repo.run_command(&["add", "-A"])
.git_context("Failed to stage changes")?;
- commit_staged_changes(&config.commit_generation)
+ commit_staged_changes(&config.commit_generation, false)
}
/// Handle `wt dev squash` command
-/// Returns true if squashing occurred, false if no squashing was needed
+/// Returns true if a commit or squash operation occurred, false if nothing needed to be done
pub fn handle_dev_squash(
target: Option<&str>,
force: bool,
@@ -201,13 +201,12 @@ pub fn handle_dev_squash(
if commit_count == 0 && has_staged {
// Just staged changes, no commits - commit them directly (no squashing needed)
- commit_staged_changes(&config.commit_generation)?;
- return Ok(false);
+ commit_staged_changes(&config.commit_generation, true)?;
+ return Ok(true);
}
if commit_count == 1 && !has_staged {
// Single commit, no staged changes - nothing to do
- // Don't show hint here - the merge message will indicate "no squashing needed"
return Ok(false);
}
@@ -306,7 +305,14 @@ pub fn handle_dev_squash(
/// Handle `wt dev push` command
pub fn handle_dev_push(target: Option<&str>, allow_merge_commits: bool) -> Result<(), GitError> {
- super::worktree::handle_push(target, allow_merge_commits, "Pushed to", false, false)
+ super::worktree::handle_push(
+ target,
+ allow_merge_commits,
+ "Pushed to",
+ false,
+ false,
+ false,
+ )
}
/// Handle `wt dev rebase` command
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 2123573db..2f5ca0d2c 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -885,9 +885,9 @@ mod tests {
working_tree_diff: (0, 0), // Hidden: no dirty changes
working_tree_diff_with_main: (0, 0),
branch_diff: BranchDiffTotals { diff: (0, 0) }, // Hidden: no diff
- is_primary: true, // Hidden: no ahead/behind for primary
- upstream: UpstreamStatus::default(), // Hidden: no upstream
- worktree_state: None, // Hidden: no state
+ is_primary: true, // Hidden: no ahead/behind for primary
+ upstream: UpstreamStatus::default(), // Hidden: no upstream
+ worktree_state: None, // Hidden: no state
pr_status: None,
has_conflicts: false,
display: DisplayFields::default(),
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index b7c6ec520..6d31a18c8 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -91,8 +91,8 @@ pub fn handle_merge(
// Load config for LLM integration
let config = WorktrunkConfig::load().git_context("Failed to load config")?;
- // Handle uncommitted changes (skip if --no-commit)
- if !no_commit && repo.is_dirty()? {
+ // Handle uncommitted changes (skip if --no-commit) - track whether commit occurred
+ let committed = if !no_commit && repo.is_dirty()? {
if squash_enabled {
// Warn about untracked files before staging
if !tracked_only {
@@ -106,6 +106,7 @@ pub fn handle_merge(
repo.run_command(&["add", "-A"])
.git_context("Failed to stage changes")?;
}
+ false // Staged but didn't commit (will squash later)
} else {
// Commit immediately when not squashing
handle_commit_changes(
@@ -116,8 +117,11 @@ pub fn handle_merge(
force,
tracked_only,
)?;
+ true // Committed directly
}
- }
+ } else {
+ false // No dirty changes or --no-commit
+ };
// Squash commits if enabled - track whether squashing occurred
let squashed = if squash_enabled {
@@ -149,8 +153,15 @@ pub fn handle_merge(
)?;
}
- // Fast-forward push to target branch with squash/rebase info for consolidated message
- handle_push(Some(&target_branch), false, "Merged to", squashed, rebased)?;
+ // Fast-forward push to target branch with commit/squash/rebase info for consolidated message
+ handle_push(
+ Some(&target_branch),
+ false,
+ "Merged to",
+ committed,
+ squashed,
+ rebased,
+ )?;
// Get primary worktree path before cleanup (while we can still run git commands)
let primary_worktree_dir = repo.main_worktree_root()?;
@@ -272,6 +283,7 @@ pub fn show_llm_config_hint_if_needed(
/// Commit already-staged changes with LLM-generated or fallback message
pub fn commit_staged_changes(
commit_generation_config: &worktrunk::config::CommitGenerationConfig,
+ show_no_squash_note: bool,
) -> Result<(), GitError> {
let repo = Repository::current();
@@ -289,9 +301,19 @@ pub fn commit_staged_changes(
"Committing with default message..."
};
- let full_progress_msg = match stats_parts.is_empty() {
- true => format!("πŸ”„ {CYAN}{action}{CYAN:#}"),
- false => format!("πŸ”„ {CYAN}{action}{CYAN:#} ({})", stats_parts.join(", ")),
+ // Build the progress message with optional squash status
+ let mut parts = vec![];
+ if !stats_parts.is_empty() {
+ parts.extend(stats_parts);
+ }
+ if show_no_squash_note {
+ parts.push("no squashing needed".to_string());
+ }
+
+ let full_progress_msg = if parts.is_empty() {
+ format!("πŸ”„ {CYAN}{action}{CYAN:#}")
+ } else {
+ format!("πŸ”„ {CYAN}{action}{CYAN:#} ({})", parts.join(", "))
};
crate::output::progress(full_progress_msg)?;
@@ -361,7 +383,8 @@ fn handle_commit_changes(
.git_context("Failed to stage changes")?;
}
- commit_staged_changes(commit_generation_config)
+ // Show "no squashing needed" since we're committing directly (not in squash mode)
+ commit_staged_changes(commit_generation_config, true)
}
fn handle_squash(target_branch: &str, no_verify: bool, force: bool) -> Result<bool, GitError> {
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index f225f48da..b62d24626 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -561,6 +561,7 @@ pub fn handle_push(
target: Option<&str>,
allow_merge_commits: bool,
verb: &str,
+ committed: bool,
squashed: bool,
rebased: bool,
) -> Result<(), GitError> {
@@ -645,24 +646,26 @@ pub fn handle_push(
"Pushing"
};
- // Build operation context based on what happened
- let mut operations = Vec::new();
+ let cyan_dim = CYAN.dimmed();
- // Only mention operations that DIDN'T happen - if they did happen,
- // the user already saw progress/success messages for them
- if !squashed {
- operations.push("no squashing needed".to_string());
+ // Build parenthetical showing which operations didn't happen
+ let mut skipped_ops = Vec::new();
+ if !committed && !squashed {
+ // Neither commit nor squash happened - combine them
+ skipped_ops.push("commit/squash");
}
-
if !rebased {
- operations.push("no rebasing needed".to_string());
+ skipped_ops.push("rebase");
}
- let operations_text = operations.join(", ");
- let cyan_dim = CYAN.dimmed();
+ let operations_note = if skipped_ops.is_empty() {
+ String::new()
+ } else {
+ format!(" (no {} needed)", skipped_ops.join("/"))
+ };
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_text})\n"
+ "πŸ”„ {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}\n"
))?;
// Show the commit graph with color
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 85c3759e9..c378d9840 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1968,7 +1968,7 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -2075,7 +2075,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 b3fcd2383..338b14c10 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
@@ -17,7 +17,7 @@ expression: output.normalized().as_ref()
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
* d067f01 (HEAD -> feature) Add feature
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 9a5dc9374..b5804631c 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
@@ -14,7 +14,7 @@ expression: output.normalized().as_ref()
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
* d067f01 (HEAD -> feature) Add feature
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 55dd8053e..cb769dfa0 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
@@ -17,7 +17,7 @@ expression: output.normalized().as_ref()
  echo 'βœ“ All 47 tests passed in 2.3s'
-πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
* d067f01 (HEAD -> feature) Add feature
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 0a6c23135..39d29a001 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.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 610c2beb1..3bebed9cd 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 2ffc7fc72..7ce023f58 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/.tmpO6T4uv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvtYDLe/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
  - feat: add file 2
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 49c86283a..d16c2c243 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/.tmpd1IeyI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXGnU03/test-config.toml
---
success: true
exit_code: 0
@@ -30,7 +30,7 @@ exit_code: 0
  - feat: initial feature
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 d1f21b5d6..ca48a3137 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/.tmpceSsPf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCbiDKo/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - feat: add authentication
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 f0d782bed..f234b3517 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,18 +16,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVdi4r3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphjpNKM/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: dirty.txt
-πŸ”„ Committing with default message... (1 file, +1)
+πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to dirty.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Changes to dirty.txt
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 c3633bcfb..9de2601b2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTVQpvp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpL6eu0T/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 077adaa7f..64151d942 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,18 +16,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8CZaQW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX3HlOi/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: newfile.txt
-πŸ”„ Committing with default message... (1 file, +1)
+πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to newfile.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
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 7efcc2fec..3f24a4cb9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3R9uhq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZ1mZNK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) feat: add file 2
* [SHA] feat: add file 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 d74418df2..347a6303a 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,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3BtJLO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnmXF8t/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 40635e0c2..2facea79d 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,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSoqOuS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYN9LRf/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 d52d0eb11..10226753a 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,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkF12CC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpob77Cf/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 fffb42efe..ab5ee2207 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,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplVioVl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp854Zys/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 6579c3fb2..c37cf0216 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/.tmpOU99JO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIHu3qb/test-config.toml
---
success: true
exit_code: 0
@@ -26,12 +26,12 @@ exit_code: 0
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
-πŸ”„ Committing with default message... (1 file, +1)
+πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to feature.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Changes to feature.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 f3fc27ef4..8f64d867c 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
@@ -13,7 +13,7 @@ STDERR-FROM-FIRST
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 b5f38c6d2..adf02617a 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMeVAyf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJqYFOd/test-config.toml
---
success: false
exit_code: 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 9b3a3fe4c..c55305f02 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/.tmpdEDWiJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPVwD3N/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,7 @@ exit_code: 0
πŸ”„ Running pre-merge: test
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 60d53681a..49b76e885 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppHE25z/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVAcbvf/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,7 @@ exit_code: 0
πŸ”„ Running pre-merge: check2
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 8f64a5070..ce9cf1620 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/.tmpWwFahF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfx1gf9/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
πŸ”„ Running pre-merge:
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 2e2d568ab..7062caff2 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/.tmpOFFeyS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu9jXbc/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 d823701a5..c94f05d58 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/.tmpCVTX2D/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdtrtbG/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - docs: update readme
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 b8dc54f6b..49fdc39df 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/.tmp4u5WDs/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcf9s1q/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - fix: bug fix
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 979bf6704..7a3c124b6 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,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprgn3iB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdH5Sjv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) feat: single commit
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 7ededc9c2..69cc6d232 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/.tmpC2WOyY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUgMXq5/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,7 @@ exit_code: 0
  - fix: handle edge case
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 e1146b425..ea8d8ea34 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYUyKxh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprjh2Fp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 151727370..9d2b77703 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,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjIPIJl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAQALRW/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 a7e60c7f5..8d351a396 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/.tmpyOZjZN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDKCFqS/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
  - feat: add file 1
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 e08a5998e..6444e24fe 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/.tmpFFflmq/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYIUv2V/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/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/.tmpFFflmq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYIUv2V/test-config.toml
---
success: true
exit_code: 0
@@ -42,7 +42,7 @@ exit_code: 0
πŸ”„ Running pre-merge: test
  cargo test
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
* [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
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 96d2145fc..04797e918 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZKumOL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUz5Wll/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> fix-auth) Implement JWT validation
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 c71c1bd59..44c393536 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr59z4I/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptW56UH/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add test file
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 73f4b780f..c289874aa 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,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJVAds2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRYtwGn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file
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 67b001318..e60671f5b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4rDtCD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX4hE69/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
* [SHA] (HEAD -> feature) Add feature file