From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:42 +0000 (-0700)
Subject: Merge branch 'rs/branch-delete-bisect-warning' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b23e3bd039917b0333f478feb8f80ac40949e83;p=thirdparty%2Fgit.git

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

'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
---

4b23e3bd039917b0333f478feb8f80ac40949e83
diff --cc branch.c
index 3a12e2a9eb,a9fc790818..22f4f46b96
--- a/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;