Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: improve BranchAlreadyExists hint wording (#797)
Maximilian Roos483f806e8371
diff --git a/src/git/error.rs b/src/git/error.rsindex a65c2524b..d47ff7640 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -310,7 +310,7 @@ impl std::fmt::Display for GitError {"{}\n{}",error_message(cformat!("Branch <bold>{branch}</> already exists")),hint_message(cformat!(- "To switch to the existing branch, remove <bright-black>--create</> and run <bright-black>{switch_cmd}</>"+ "To switch to the existing branch, run without <bright-black>--create</>: <bright-black>{switch_cmd}</>")))}@@ -935,7 +935,7 @@ mod tests {let downcast = err.downcast_ref::<GitError>().expect("Should downcast");assert_snapshot!(downcast.to_string(), @"[31m✗[39m [31mBranch [1mmain[22m already exists[39m- [2m↳[22m [2mTo switch to the existing branch, remove [90m--create[39m and run [90mwt switch main[39m[22m+ [2m↳[22m [2mTo switch to the existing branch, run without [90m--create[39m: [90mwt switch main[39m[22m");}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snapindex 7009724da..799d9172b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap@@ -3,4 +3,4 @@ source: tests/integration_tests/git_error_display.rsexpression: err.to_string()---[31m✗[39m [31mBranch [1mfeature[22m already exists[39m-[2m↳[22m [2mTo switch to the existing branch, remove [90m--create[39m and run [90mwt switch feature[39m[22m+[2m↳[22m [2mTo switch to the existing branch, run without [90m--create[39m: [90mwt switch feature[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snapindex ce5747f2d..09367b92c 100644--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap@@ -38,4 +38,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m-[2m↳[22m [2mTo switch to the existing branch, remove [90m--create[39m and run [90mwt switch __WORKTRUNK_CD__/tmp[39m[22m+[2m↳[22m [2mTo switch to the existing branch, run without [90m--create[39m: [90mwt switch __WORKTRUNK_CD__/tmp[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snapindex d97aaa91d..4b4ca7bde 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__command_failure.snap@@ -4,4 +4,4 @@ expression: "&output.combined"---[31m✗[39m [31mBranch [1mexisting[22m already exists[39m-[2m↳[22m [2mTo switch to the existing branch, remove [90m--create[39m and run [90mwt switch existing[39m[22m+[2m↳[22m [2mTo switch to the existing branch, run without [90m--create[39m: [90mwt switch existing[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex 082a3bca0..de2f6de2f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap@@ -37,4 +37,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mBranch [1mfeature-y[22m already exists[39m-[2m↳[22m [2mTo switch to the existing branch, remove [90m--create[39m and run [90mwt switch feature-y[39m[22m+[2m↳[22m [2mTo switch to the existing branch, run without [90m--create[39m: [90mwt switch feature-y[39m[22m