Skip to content

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.rs
index 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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging untracked files: dirty.txt
+🟑 Auto-staging 1 untracked file:
+  dirty.txt
πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to dirty.txt
diff --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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging untracked files: newfile.txt
+🟑 Auto-staging 1 untracked file:
+  newfile.txt
πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to newfile.txt
diff --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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: false
exit_code: 1
----- stdout -----
-🟑 Auto-staging untracked files: feature.txt
+🟑 Auto-staging 1 untracked file:
+  feature.txt
πŸ”„ Running pre-commit:
  exit 1
diff --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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging untracked files: feature.txt
+🟑 Auto-staging 1 untracked file:
+  feature.txt
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
πŸ”„ Committing with default message... (1 file, +1, 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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging untracked files: untracked1.txt, untracked2.txt
+🟑 Auto-staging 2 untracked files:
+  untracked1.txt
+  untracked2.txt
πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages