Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Use current_branch instead of target_branch in squash message (#1319)
ricafeal4e047e44bab3
diff --git a/src/llm.rs b/src/llm.rsindex 10ab4612a..52035b77a 100644--- a/src/llm.rs+++ b/src/llm.rs@@ -601,7 +601,7 @@ pub(crate) fn generate_squash_message(}// Fallback: deterministic commit message (only when not configured)- let mut commit_message = format!("Squash commits from {}\n\n", target_branch);+ let mut commit_message = format!("Squash commits from {}\n\n", current_branch);commit_message.push_str("Combined commits:\n");for subject in subjects.iter().rev() {// Reverse so they're in chronological orderdiff --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 5a5fc1156..e289d3c76 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@@ -13,7 +13,6 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -46,13 +45,13 @@ exit_code: 0[2m↳[22m [2mBackup created @ ba39431[22m[36m◎[39m [36mGenerating squash commit message...[39m[2m↳[22m [2mUsing fallback commit message. For LLM setup guide, run [4mwt config --help[24m[22m-[107m [0m [1mSquash commits from main[22m+[107m [0m [1mSquash commits from feature[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature[32m✓[39m [32mSquashed @ [HASH][39m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m-[107m [0m * [33m[HASH][m Squash commits from main+[107m [0m * [33m[HASH][m Squash commits from feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snapindex a4e28555d..702a099ec 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap@@ -14,7 +14,6 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -49,7 +48,7 @@ exit_code: 0[36m◎[39m [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m[36m◎[39m [36mGenerating squash commit message...[39m[2m↳[22m [2mUsing fallback commit message. For LLM setup guide, run [4mwt config --help[24m[22m-[107m [0m [1mSquash commits from main[22m+[107m [0m [1mSquash commits from feature[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1@@ -57,7 +56,7 @@ exit_code: 0[107m [0m - Add config[32m✓[39m [32mSquashed @ [HASH][39m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m-[107m [0m * [33m[HASH][m Squash commits from main+[107m [0m * [33m[HASH][m Squash commits from feature[107m [0m .config/wt.toml | 1 [32m+[m[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex a9b8e05aa..7ca3f946e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -13,7 +13,6 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -45,7 +44,7 @@ exit_code: 0[36m◎[39m [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m[36m◎[39m [36mGenerating squash commit message...[39m[2m↳[22m [2mUsing fallback commit message. For LLM setup guide, run [4mwt config --help[24m[22m-[107m [0m [1mSquash commits from main[22m+[107m [0m [1mSquash commits from feature[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1@@ -53,7 +52,7 @@ exit_code: 0[107m [0m - docs: update readme[32m✓[39m [32mSquashed @ [HASH][39m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m-[107m [0m * [33m[HASH][m Squash commits from main+[107m [0m * [33m[HASH][m Squash commits from feature[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 4448b214e..a91d2e851 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -13,7 +13,6 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -45,7 +44,7 @@ exit_code: 0[36m◎[39m [36mSquashing 3 commits into a single commit...[39m[36m◎[39m [36mGenerating squash commit message...[39m[2m↳[22m [2mUsing fallback commit message. For LLM setup guide, run [4mwt config --help[24m[22m-[107m [0m [1mSquash commits from main[22m+[107m [0m [1mSquash commits from feature[22m[107m [0m[107m [0m Combined commits:[107m [0m - Change 1