Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(squash): Unify auto-staging logic for `merge` and `squash`
Maximilian Roos06074a708f29
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex d0583097d..03e695bde 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -5,7 +5,7 @@ use worktrunk::styling::{CYAN, CYAN_BOLD, ERROR, ERROR_EMOJI, GREEN_BOLD, HINT,use super::command_approval::approve_command_batch;use super::command_executor::CommandContext;-use super::commit::{CommitOptions, commit_changes, warn_untracked_auto_stage};+use super::commit::{CommitOptions, commit_changes};use super::context::CommandEnv;use super::hooks::{HookFailureStrategy, HookPipeline};use super::project_config::load_project_config;@@ -115,19 +115,7 @@ pub fn handle_merge(// Handle uncommitted changes (skip if --no-commit) - track whether commit occurredlet committed = if !no_commit && repo.is_dirty()? {if squash_enabled {- // Warn about untracked files before staging- if !tracked_only {- warn_untracked_auto_stage(&repo)?;- }-- if tracked_only {- repo.run_command(&["add", "-u"])- .git_context("Failed to stage tracked changes")?;- } else {- repo.run_command(&["add", "-A"])- .git_context("Failed to stage changes")?;- }- false // Staged but didn't commit (will squash later)+ false // Squash path handles staging and committing} else {// Commit immediately when not squashinglet repo_root = repo.worktree_base()?;@@ -156,7 +144,7 @@ pub fn handle_merge(// Squash commits if enabled - track whether squashing occurredlet squashed = if squash_enabled {- handle_squash(&target_branch, force)?+ handle_squash(&target_branch, force, no_verify, tracked_only)?} else {false};@@ -288,9 +276,21 @@ fn handle_merge_summary_output(primary_path: Option<&std::path::Path>) -> ResultOk(())}-fn handle_squash(target_branch: &str, force: bool) -> Result<bool, GitError> {+fn handle_squash(+ target_branch: &str,+ force: bool,+ skip_pre_commit: bool,+ tracked_only: bool,+) -> Result<bool, GitError> {// Delegate to the shared standalone implementation (auto_trust=true: commands approved in batch)- super::standalone::handle_standalone_squash(Some(target_branch), force, false, true)+ super::standalone::handle_standalone_squash(+ Some(target_branch),+ force,+ skip_pre_commit,+ true,+ tracked_only,+ !tracked_only,+ )}/// Run pre-merge commands sequentially (blocking, fail-fast)diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 8ff5f6337..e889d9c37 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -7,7 +7,7 @@ use worktrunk::styling::{use super::command_executor::CommandContext;use super::commit::{CommitOptions, commit_changes, commit_staged_changes, format_commit_message_for_display,- run_pre_commit_commands, show_llm_config_hint_if_needed,+ run_pre_commit_commands, show_llm_config_hint_if_needed, warn_untracked_auto_stage,};use super::context::CommandEnv;use super::merge::{execute_post_merge_commands, run_pre_merge_commands};@@ -121,6 +121,8 @@ pub fn handle_standalone_commit(force: bool, no_verify: bool) -> Result<(), GitE////// # Arguments/// * `auto_trust` - If true, skip approval prompts for pre-commit commands (already approved in batch)+/// * `tracked_only` - Stage only tracked files (mirrors `--tracked-only` in merge)+/// * `warn_about_untracked` - Emit a warning before auto-staging untracked files////// Returns true if a commit or squash operation occurred, false if nothing needed to be donepub fn handle_standalone_squash(@@ -128,6 +130,8 @@ pub fn handle_standalone_squash(force: bool,skip_pre_commit: bool,auto_trust: bool,+ tracked_only: bool,+ warn_about_untracked: bool,) -> Result<bool, GitError> {let CommandEnv {repo,@@ -139,6 +143,19 @@ pub fn handle_standalone_squash(// Get target branch (default to default branch if not provided)let target_branch = repo.resolve_target_branch(target)?;+ // Auto-stage changes before running pre-commit hooks so both beta and merge paths behave identically+ if warn_about_untracked && !tracked_only {+ warn_untracked_auto_stage(&repo)?;+ }++ if tracked_only {+ repo.run_command(&["add", "-u"])+ .git_context("Failed to stage tracked changes")?;+ } else {+ repo.run_command(&["add", "-A"])+ .git_context("Failed to stage changes")?;+ }+// Run pre-commit hook unless explicitly skippedif !skip_pre_commit && let Some(project_config) = load_project_config(&repo)? {let repo_root = repo.worktree_base()?;diff --git a/src/main.rs b/src/main.rsindex 249553cd1..fe9f3192c 100644--- a/src/main.rs+++ b/src/main.rs@@ -168,7 +168,8 @@ fn main() {target,force,no_verify,- } => handle_standalone_squash(target.as_deref(), force, no_verify, false).map(|_| ()),+ } => handle_standalone_squash(target.as_deref(), force, no_verify, false, false, true)+ .map(|_| ()),StandaloneCommand::Push {target,allow_merge_commits,