Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor `AutoStageWarning` wording to use "path" over "file"
Maximilian Roos09951e6dbf2c
diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rsindex 6e7424694..33ebe0756 100644--- a/src/commands/repository_ext.rs+++ b/src/commands/repository_ext.rs@@ -332,8 +332,8 @@ impl AutoStageWarning {}let count = self.files.len();- let file_word = if count == 1 { "file" } else { "files" };- crate::output::warning(format!("Auto-staging {count} untracked {file_word}:"))?;+ let path_word = if count == 1 { "path" } else { "paths" };+ crate::output::warning(format!("Auto-staging {count} untracked {path_word}:"))?;let joined_files = self.files.join("\n");crate::output::gutter(format_with_gutter(&joined_files, "", None))?;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 409bec62c..67c934ea9 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@@ -23,7 +23,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked path:[39m[107m [0m dirty.txtπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39mπ‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22mdiff --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 f70b68eee..e1dc4b175 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@@ -23,7 +23,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked path:[39m[107m [0m newfile.txtπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39mπ‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22mdiff --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 e93b46d84..5dacb7013 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@@ -24,7 +24,7 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked path:[39m[107m [0m feature.txtπ [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 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 ac463342b..e8ef4c594 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@@ -24,7 +24,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked path:[39m[107m [0m feature.txtπ [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mdiff --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 5b60b240c..eea667bc8 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@@ -25,7 +25,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 2 untracked files:[39m+π‘ [33mAuto-staging 2 untracked paths:[39m[107m [0m untracked1.txt[107m [0m untracked2.txtπ [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex a32589f54..8830c7258 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap@@ -27,7 +27,7 @@ exit_code: 0----- stderr -----π‘ [2mSkipping pre-commit hook ([90m--no-verify[39m)[22m-π‘ [33mAuto-staging 2 untracked files:[39m+π‘ [33mAuto-staging 2 untracked paths:[39m[107m [0m .config/[107m [0m file1.txtπ [36mCommitting changes with default message... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m