Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Move safety backup before squash message generation
Maximilian Roosd5bea3901d99
diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 43dc66011..2d44ea59f 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -166,6 +166,15 @@ pub fn handle_squash(};crate::output::progress(squash_progress)?;+ // Create safety backup before potentially destructive reset if there are working tree changes+ if has_staged {+ let backup_message = format!("{} → {} (squash)", current_branch, target_branch);+ let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;+ use worktrunk::styling::AnstyleStyle;+ let dim = AnstyleStyle::new().dimmed();+ crate::output::hint(format!("Backup created @ {dim}{sha}{dim:#}"))?;+ }+// Get commit subjects for the squash messagelet subjects = repo.commit_subjects(&range)?;@@ -194,15 +203,6 @@ pub fn handle_squash(let formatted_message = generator.format_message_for_display(&commit_message);crate::output::gutter(format_with_gutter(&formatted_message, "", None))?;- // Create safety backup before potentially destructive reset if there are working tree changes- if has_staged {- let backup_message = format!("{} → {} (squash)", current_branch, target_branch);- let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;- use worktrunk::styling::AnstyleStyle;- let dim = AnstyleStyle::new().dimmed();- crate::output::hint(format!("Backup created @ {dim}{sha}{dim:#}"))?;- }-// Reset to merge base (soft reset stages all changes, including any already-staged uncommitted changes)repo.run_command(&["reset", "--soft", &merge_base]).context("Failed to reset to merge base")?;diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 5b0e2c523..ec1c6c080 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@@ -24,6 +24,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...+💡 Backup created @ [SHA]🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m@@ -31,7 +32,6 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 112dc7c28..6d4e75b96 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@@ -22,13 +22,13 @@ success: trueexit_code: 0----- stdout -----🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+💡 Backup created @ [SHA]🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature-💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex fd5b332d4..000544ab2 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@@ -24,13 +24,13 @@ success: trueexit_code: 0----- stdout -----🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+💡 Backup created @ [SHA]🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add authentication-💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex d13fa15d6..dea55e3d8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -24,6 +24,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...+💡 Backup created @ [SHA]🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m@@ -31,7 +32,6 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 3a6d5266b..b3c039644 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@@ -27,13 +27,13 @@ exit_code: 0[107m [0m untracked1.txt[107m [0m untracked2.txt🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+💡 Backup created @ [SHA]🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1-💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main