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.rsindex 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.snapindex 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-π‘ [2mUse --no-hooks to skip pre-merge commands[0m+π‘ [2mUse --no-verify to skip pre-merge commands[0mdiff --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.snapindex 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-π‘ [2mUse --no-hooks to skip pre-merge commands[0m+π‘ [2mUse --no-verify to skip pre-merge commands[0mπ [36mRunning pre-merge [1mformat[0m:[0m[40m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[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 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: 1Command failed with exit code: exit status: 1-π‘ [2mUse --no-hooks to skip pre-commit commands[0m+π‘ [2mUse --no-verify to skip pre-commit commands[0mdiff --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.snapindex 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: 1Command failed with exit code: exit status: 1-π‘ [2mUse --no-hooks to skip pre-merge commands[0m+π‘ [2mUse --no-verify to skip pre-merge commands[0mdiff --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.snapindex 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: 1Command failed with exit code: exit status: 1-π‘ [2mUse --no-hooks to skip pre-commit commands[0m+π‘ [2mUse --no-verify to skip pre-commit commands[0m