Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Show executed pre-merge checks in output

Maximilian Roosdd070b5627b5
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 3870de298..ced825fa9 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -1,7 +1,7 @@
use worktrunk::config::{ProjectConfig, WorktrunkConfig};
use worktrunk::git::{GitError, Repository};
use worktrunk::styling::{
- AnstyleStyle, CYAN, CYAN_BOLD, ERROR, ERROR_EMOJI, GREEN, GREEN_BOLD, HINT, HINT_EMOJI,
+ AnstyleStyle, CYAN, CYAN_BOLD, ERROR, ERROR_EMOJI, GREEN, GREEN_BOLD, HINT, HINT_EMOJI, eprint,
eprintln, format_with_gutter, println,
};
@@ -359,11 +359,13 @@ fn run_pre_merge_checks(
},
)?;
for prepared in commands {
- crate::output::progress(format!(
- "πŸ”„ {CYAN}Running pre-merge check '{name}'...{CYAN:#}",
+ use std::io::Write;
+ eprintln!(
+ "πŸ”„ {CYAN}Running pre-merge check '{name}':{CYAN:#}",
name = prepared.name
- ))
- .map_err(|e| GitError::CommandFailed(e.to_string()))?;
+ );
+ eprint!("{}", format_with_gutter(&prepared.expanded, "")); // Gutter at column 0
+ let _ = std::io::stderr().flush();
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
eprintln!();
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap
index c240a1332..eb524838b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap
@@ -15,14 +15,16 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBzUvkE/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Running pre-merge check 'cmd'...
----- stderr -----
+πŸ”„ Running pre-merge check 'cmd':
+  exit 1
❌ Pre-merge check failed: cmd
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
index 3d625b92f..807079676 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/merge.rs
-assertion_line: 11
info:
program: wt
args:
@@ -16,14 +15,12 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYOJsjk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge check 'format'...
-πŸ”„ Running pre-merge check 'lint'...
-πŸ”„ Running pre-merge check 'test'...
πŸ”„ Rebasing onto main...
πŸ”„ Pushing 1 commit to main @ [SHA]
@@ -42,3 +39,9 @@ exit_code: 0
Worktree: Removed
----- stderr -----
+πŸ”„ Running pre-merge check 'format':
+  exit 0
+πŸ”„ Running pre-merge check 'lint':
+  exit 0
+πŸ”„ Running pre-merge check 'test':
+  exit 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
index b60128191..33b9c24bf 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/merge.rs
-assertion_line: 11
info:
program: wt
args:
@@ -16,12 +15,12 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAbfvJx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge check 'cmd'...
πŸ”„ Rebasing onto main...
πŸ”„ Pushing 1 commit to main @ [SHA]
@@ -40,3 +39,5 @@ exit_code: 0
Worktree: Removed
----- stderr -----
+πŸ”„ Running pre-merge check 'cmd':
+  exit 0