From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jul 2026 16:10:55 +0000 (-0700)
Subject: Merge branch 'hn/branch-delete-merged' into next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c61a87bdf5fd46f4921228da399264eced14f380;p=thirdparty%2Fgit.git

Merge branch 'hn/branch-delete-merged' into next

The 'git branch' command has been taught the '--delete-merged' option
to remove local branches that are already merged into their tracked
remote-tracking branches.

* hn/branch-delete-merged:
  branch: add --dry-run for --delete-merged
  branch: add branch.<name>.deleteMerged opt-out
  branch: add --delete-merged <branch>
  branch: prepare delete_branches for a bulk caller
  branch: let delete_branches skip unmerged branches on bulk refusal
  branch: convert delete_branches() to a flags argument
  branch: add --forked filter for --list mode
---

c61a87bdf5fd46f4921228da399264eced14f380
diff --cc builtin/branch.c
index 031a4a9d05,fa8f3ee4df..fe9376e5f1
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@@ -257,10 -275,9 +275,10 @@@ static int delete_branches(int argc, co
  
  	for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
  		char *target = NULL;
- 		int flags = 0;
+ 		int ref_flags = 0;
  
 -		copy_branchname(&bname, argv[i], allowed_interpret);
 +		copy_branchname(the_repository, &bname,
 +				argv[i], allowed_interpret);
  		free(name);
  		name = mkpathdup(fmt, bname.buf);