Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor(commit): Improve auto-staging warning display
Maximilian Roosafa26a428fb8
diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex b452cb9e9..eb0eb03f0 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -85,11 +85,15 @@ pub fn warn_untracked_auto_stage(repo: &Repository) -> Result<(), GitError> {return Ok(());}- let file_list = untracked.join(", ");+ let count = untracked.len();+ let file_word = if count == 1 { "file" } else { "files" };crate::output::warning(format!(- "{WARNING}Auto-staging untracked files: {file_list}{WARNING:#}"+ "{WARNING}Auto-staging {count} untracked {file_word}:{WARNING:#}"))?;+ let joined_files = untracked.join("\n");+ crate::output::gutter(format_with_gutter(&joined_files, "", None))?;+Ok(())}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.snapindex 1e0d44bbc..d295bfde2 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@@ -12,16 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0xgXxW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXuqopt/test-config.toml---success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging untracked files: dirty.txt[0m+π‘ [33mAuto-staging 1 untracked file:[0m+[40m [0m dirty.txtπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mChanges to dirty.txt[0mdiff --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.snapindex f079e8f1e..8f38647b7 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@@ -12,16 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBXglvy/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmCFnfg/test-config.toml---success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging untracked files: newfile.txt[0m+π‘ [33mAuto-staging 1 untracked file:[0m+[40m [0m newfile.txtπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mChanges to newfile.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex f236702ff..3749a12ee 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap@@ -13,16 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX9hiBN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXveIlz/test-config.toml---success: falseexit_code: 1----- stdout ------π‘ [33mAuto-staging untracked files: feature.txt[0m+π‘ [33mAuto-staging 1 untracked file:[0m+[40m [0m feature.txtπ [36mRunning pre-commit:[0m[40m [0m [1m[34mexit[0m 1[0mdiff --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.snapindex 6d9fa7447..f03c4d491 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@@ -13,16 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUZCeGN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKT43OK/test-config.toml---success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging untracked files: feature.txt[0m+π‘ [33mAuto-staging 1 untracked file:[0m+[40m [0m feature.txtπ [36mRunning pre-commit:[0m[40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0mπ [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)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.snapindex c9562f048..dedcac9b1 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@@ -12,18 +12,19 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBieRmJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptF5zZb/test-config.toml---success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging untracked files: untracked1.txt, untracked2.txt[0m+π‘ [33mAuto-staging 2 untracked files:[0m+[40m [0m untracked1.txt+[40m [0m untracked2.txtπ [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m