Skip to content

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

Update hook bypass flag message to `--no-verify`

Maximilian Roosbfaa1639e7a0
diff --git a/src/git/error.rs b/src/git/error.rs
index ebd2e871b..32f21fac7 100644
--- a/src/git/error.rs
+++ b/src/git/error.rs
@@ -120,11 +120,11 @@ impl std::fmt::Display for GitError {
} => match command_name {
Some(name) => write!(
f,
- "{ERROR_EMOJI} {ERROR}{hook_type} command failed: {ERROR_BOLD}{name}{ERROR_BOLD:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip {hook_type} commands{HINT:#}"
+ "{ERROR_EMOJI} {ERROR}{hook_type} command failed: {ERROR_BOLD}{name}{ERROR_BOLD:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-verify to skip {hook_type} commands{HINT:#}"
),
None => write!(
f,
- "{ERROR_EMOJI} {ERROR}{hook_type} command failed{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip {hook_type} commands{HINT:#}"
+ "{ERROR_EMOJI} {ERROR}{hook_type} command failed{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-verify to skip {hook_type} commands{HINT:#}"
),
},
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 83549bb2e..9a53d6bd7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -15,4 +15,4 @@ expression: output.normalized()
Command failed with exit code: exit status: 1
-πŸ’‘ Use --no-hooks to skip pre-merge commands
+πŸ’‘ Use --no-verify to skip pre-merge commands
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index d4ea08734..109edb381 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -8,7 +8,7 @@ expression: output.normalized()
Command failed with exit code: exit status: 1
-πŸ’‘ Use --no-hooks to skip pre-merge commands
+πŸ’‘ Use --no-verify to skip pre-merge commands
πŸ”„ Running pre-merge format:
  echo 'βœ“ Code formatting check passed'
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 3749a12ee..c99eacb17 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
@@ -31,4 +31,4 @@ exit_code: 1
Command failed with exit code: exit status: 1
-πŸ’‘ Use --no-hooks to skip pre-commit commands
+πŸ’‘ Use --no-verify to skip pre-commit commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 70f254bd1..580f9c27f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -30,4 +30,4 @@ exit_code: 1
Command failed with exit code: exit status: 1
-πŸ’‘ Use --no-hooks to skip pre-merge commands
+πŸ’‘ Use --no-verify to skip pre-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 4743c3075..f40eb108f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -30,4 +30,4 @@ exit_code: 1
Command failed with exit code: exit status: 1
-πŸ’‘ Use --no-hooks to skip pre-commit commands
+πŸ’‘ Use --no-verify to skip pre-commit commands