Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix(remove): show the delete-branch config override (#4615)
Worktrunk Bot2ab571273ead
diff --git a/docs/src/content/docs/remove.md b/docs/src/content/docs/remove.mdindex b7deafcaa..372bd0c2a 100644--- a/docs/src/content/docs/remove.md+++ b/docs/src/content/docs/remove.md@@ -34,6 +34,12 @@ Keep the branch:$ wt remove --no-delete-branch feature-branch```+If `[remove] delete-branch = false` is configured, use `--delete-branch` to delete a branch for one removal:++```console+$ wt remove --delete-branch feature-branch+```+Force-delete an unmerged branch:```console@@ -148,6 +154,9 @@ Options:--no-delete-branchKeep branch after removal+ --delete-branch+ Delete branch after removal (overrides config [remove] delete-branch = false)+-D, --force-deleteDelete unmerged branchesdiff --git a/plugins/worktrunk/skills/worktrunk/reference/remove.md b/plugins/worktrunk/skills/worktrunk/reference/remove.mdindex 062a1a51f..c8fbdbe34 100644--- a/plugins/worktrunk/skills/worktrunk/reference/remove.md+++ b/plugins/worktrunk/skills/worktrunk/reference/remove.md@@ -28,6 +28,12 @@ Keep the branch:$ wt remove --no-delete-branch feature-branch```+If `[remove] delete-branch = false` is configured, use `--delete-branch` to delete a branch for one removal:++```console+$ wt remove --delete-branch feature-branch+```+Force-delete an unmerged branch:```console@@ -135,6 +141,9 @@ Options:--no-delete-branchKeep branch after removal+ --delete-branch+ Delete branch after removal (overrides config [remove] delete-branch = false)+-D, --force-deleteDelete unmerged branchesdiff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.mdindex 062a1a51f..c8fbdbe34 100644--- a/skills/worktrunk/reference/remove.md+++ b/skills/worktrunk/reference/remove.md@@ -28,6 +28,12 @@ Keep the branch:$ wt remove --no-delete-branch feature-branch```+If `[remove] delete-branch = false` is configured, use `--delete-branch` to delete a branch for one removal:++```console+$ wt remove --delete-branch feature-branch+```+Force-delete an unmerged branch:```console@@ -135,6 +141,9 @@ Options:--no-delete-branchKeep branch after removal+ --delete-branch+ Delete branch after removal (overrides config [remove] delete-branch = false)+-D, --force-deleteDelete unmerged branchesdiff --git a/src/cli/mod.rs b/src/cli/mod.rsindex b6c3e3a00..b212acea5 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -501,11 +501,7 @@ pub(crate) struct RemoveArgs {pub(crate) no_delete_branch: bool,/// Delete branch after removal (overrides config `[remove] delete-branch = false`)- #[arg(- long = "delete-branch",- overrides_with = "no_delete_branch",- hide = true- )]+ #[arg(long = "delete-branch", overrides_with = "no_delete_branch")]pub(crate) delete_branch: bool,/// Delete unmerged branches@@ -1331,6 +1327,12 @@ Keep the branch:$ wt remove --no-delete-branch feature-branch```+If `[remove] delete-branch = false` is configured, use `--delete-branch` to delete a branch for one removal:++```console+$ wt remove --delete-branch feature-branch+```+Force-delete an unmerged branch:```consolediff --git a/src/commands/remove.rs b/src/commands/remove.rsindex 8f5eff683..477d9a0ab 100644--- a/src/commands/remove.rs+++ b/src/commands/remove.rs@@ -392,10 +392,15 @@ pub fn handle_remove_command(args: RemoveArgs, yes: bool) -> anyhow::Result<()>// Validate conflicting flagsif !delete_branch && args.force_delete {+ let message = if args.no_delete_branch {+ "Cannot use --force-delete with --no-delete-branch"+ } else {+ "Cannot use --force-delete with [remove] delete-branch = false; use --delete-branch to override it"+ };return Err(worktrunk::git::GitError::Other {- message: "Cannot use --force-delete with delete-branch=false (set via --no-delete-branch or [remove] delete-branch = false)".into(),- }- .into());+ message: message.into(),+ }+ .into());}// `--reap` relies on per-process cwd discovery (`lsof`/`ps`), whichdiff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rsindex a27be2dd8..8a7a7d6a2 100644--- a/tests/integration_tests/help.rs+++ b/tests/integration_tests/help.rs@@ -79,6 +79,21 @@ fn test_merge_help_describes_exact_shape_no_rebase() {);}+#[test]+fn test_remove_help_shows_delete_branch_override() {+ let output = wt_command()+ .args(["remove", "--help"])+ .output()+ .expect("failed to run wt remove --help");+ assert!(output.status.success());+ let stdout = String::from_utf8_lossy(&output.stdout);+ let stdout = stdout.ansi_strip();+ assert!(+ stdout.contains("--delete-branch"),+ "missing config override in remove help:\n{stdout}"+ );+}+// Root command (wt)#[rstest]#[case("help_root_short", "-h")]diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rsindex 997da1b52..c09e5782e 100644--- a/tests/integration_tests/remove.rs+++ b/tests/integration_tests/remove.rs@@ -2159,6 +2159,71 @@ delete-branch = false);}+#[rstest]+fn test_remove_cli_delete_branch_force_overrides_config(mut repo: TestRepo) {+ repo.write_test_config(+ r#"[remove]+delete-branch = false+"#,+ );+ let worktree_path = repo.add_worktree("feature-cli-force-override");+ std::fs::write(worktree_path.join("feature.txt"), "unmerged change").unwrap();+ repo.git_command()+ .args(["add", "feature.txt"])+ .current_dir(&worktree_path)+ .run()+ .unwrap();+ repo.git_command()+ .args(["commit", "-m", "Add unmerged change"])+ .current_dir(&worktree_path)+ .run()+ .unwrap();++ let output = repo+ .wt_command()+ .args([+ "remove",+ "--foreground",+ "--delete-branch",+ "-D",+ "feature-cli-force-override",+ ])+ .output()+ .expect("wt remove should run");+ assert!(+ output.status.success(),+ "wt remove failed: {}",+ String::from_utf8_lossy(&output.stderr)+ );+ let branches = repo+ .git_command()+ .args(["branch", "--list", "feature-cli-force-override"])+ .run()+ .unwrap()+ .stdout;+ assert!(branches.is_empty(), "force-deleted branch should be gone");+}++#[rstest]+fn test_remove_force_delete_with_config_false_suggests_override(repo: TestRepo) {+ repo.write_test_config(+ r#"[remove]+delete-branch = false+"#,+ );+ let output = repo+ .wt_command()+ .args(["remove", "-D", "nonexistent"])+ .output()+ .expect("wt remove should run");+ assert!(!output.status.success());+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert!(+ stderr.contains("use --delete-branch to override it"),+ "{stderr}"+ );+}+#[rstest]fn test_remove_no_delete_branch_unmerged(mut repo: TestRepo) {// Create a worktree with an unmerged commitdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex ef598d639..b2e8a4b39 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -56,6 +56,9 @@ Usage: [1m[36mwt remove[0m [36m[OPTIONS][0m [36m[BRANCHES]...[0m[1m[36m--no-delete-branch[0mKeep branch after removal+ [1m[36m--delete-branch[0m+ Delete branch after removal (overrides config [1m[remove] delete-branch = false[0m)+[1m[36m-D[0m, [1m[36m--force-delete[0mDelete unmerged branches@@ -123,6 +126,10 @@ Keep the branch:[107m [0m [2m[0m[2m[34mwt[0m[2m remove [0m[2m[36m--no-delete-branch[0m[2m feature-branch[0m+If [2m[remove] delete-branch = false[0m is configured, use [2m--delete-branch[0m to delete a branch for one removal:++[107m [0m [2m[0m[2m[34mwt[0m[2m remove [0m[2m[36m--delete-branch[0m[2m feature-branch[0m+Force-delete an unmerged branch:[107m [0m [2m[0m[2m[34mwt[0m[2m remove [0m[2m[36m-D[0m[2m experimental[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap b/tests/snapshots/integration__integration_tests__help__help_remove_short.snapindex 41fddd0ad..13e29aed2 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap@@ -51,6 +51,7 @@ Usage: [1m[36mwt remove[0m [36m[OPTIONS][0m [36m[BRANCHES]...[0m[1m[32mOptions:[0m[1m[36m--no-delete-branch[0m Keep branch after removal+ [1m[36m--delete-branch[0m Delete branch after removal (overrides config [1m[remove] delete-branch = false[0m)[1m[36m-D[0m, [1m[36m--force-delete[0m Delete unmerged branches[1m[36m--foreground[0m Run removal in foreground (block until complete)[1m[36m--reap[0m Kill processes started in the worktree [experimental]diff --git a/tests/snapshots/integration__integration_tests__remove__remove_conflicting_branch_flags.snap b/tests/snapshots/integration__integration_tests__remove__remove_conflicting_branch_flags.snapindex b068b4e3f..7d30f105b 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_conflicting_branch_flags.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_conflicting_branch_flags.snap@@ -61,4 +61,4 @@ exit_code: 1----- stdout ---------- stderr ------[31m✗[39m [31mCannot use --force-delete with delete-branch=false (set via --no-delete-branch or [remove] delete-branch = false)[39m+[31m✗[39m [31mCannot use --force-delete with --no-delete-branch[39m