Merge branch 'rs/branch-delete-bisect-warning' into next

'git branch -d' has been taught to report when a branch cannot be
deleted because it is being used in an active bisect run.

* rs/branch-delete-bisect-warning:
  branch: report active bisect run when rejecting delete

diff --cc branch.c
index 3a12e2a9ebeeb6e9dad8425a17c17683104dc768,a9fc79081847f078c1449b0d95da986693b1c77c..22f4f46b96ed3a326fe87bf79e9643d155acebbe
--- 1/branch.c
--- 2/branch.c
+++ b/branch.c
@@@ -394,10 -427,10 +427,10 @@@ static void prepare_checked_out_branche
                return;
        initialized_checked_out_branches = 1;
  
 -      worktrees = get_worktrees();
 +      worktrees = get_worktrees(the_repository);
  
        while (worktrees[i]) {
-               char *old, *wt_gitdir;
+               char *wt_gitdir;
                struct wt_status_state state = { 0 };
                struct worktree *wt = worktrees[i++];
                struct string_list update_refs = STRING_LIST_INIT_DUP;

diff --cc builtin/branch.c
Simple merge

diff --cc t/t3200-branch.sh
Simple merge