git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v16 0/7] branch: delete-merged

From
Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>
Date
Jun 18, 2026, 19:25 UTC
Message-ID
<pull.2285.v16.git.git.1781810729.gitgitgadget@gmail.com>
In-Reply-To
<pull.2285.v15.git.git.1781542042.gitgitgadget@gmail.com>
Delete branches that have already been merged on upstream.
Changes in v16:
 * Convert delete_merged_branches() to take an unsigned int flags argument
   instead of separate quiet/dry_run booleans, matching delete_branches()
 * Reuse the strbuf across the skip-config loop (strbuf_reset per iteration,
   single strbuf_release after) instead of allocating and freeing it each
   time
 * Rewrite the --delete-merged tests as integration tests: branches that
   land commits upstream, with deletion and the checked-out, upstream-gone,
   and push-equals-upstream safety cases exercised together in one run and
   output asserted via test_cmp
 * Collapse the many per-aspect test repos into a single reused repo set up
   by a setup_repo_for_delete_merged helper, and rename helpers off the old
   pm_/prune naming
 * Nest single-repo setup sequences in ( cd ... ) subshells instead of
   prefixing every command with -C
Changes in v15:
 * Renamed --prune-merged to --delete-merged throughout. Not necessarily
   final, but something to advance the discussion.
 * --delete-merged now silently skips not-yet-merged branches instead of
   warning.
 * Initialized the delete_branches() flag locals where declared. Only force
   stays deferred.
 * delete_branches()/check_branch_commit() doc and code cleanups: redundant
   branch NULL checks dropped, ref_array candidates = { 0 }, a BUG() for the
   unreachable non-branch ref, and reworked --delete-merged doc wording.
 * Broadened the --forked tests (local commits for realism, remote add -f,
   --forked coverage), renamed the misleading trunk fixture, and replaced
   the misnamed detached branch with git checkout --detach.
Changes in v14:
 * Fixed a git branch -d -r regression (broke t5404/t5505/t5514): the
   remotes path set a local force but not the DELETE_BRANCH_FORCE bit that
   check_branch_commit() reads, so it wrongly ran the merge check.
 * Made flags the single source of truth in delete_branches() so the bit and
   the derived locals can't disagree.
 * Works locally, but GitHub CI has problems that are there for other
   branches too, hopefully not related
   (https://github.com/git/git/pull/2285).
Changes in v13:
 * Reworked --forked into a real ref-filter applied in apply_ref_filter()
   instead of a post-pass, so non-matching branches are never allocated.
 * Match exact --forked patterns on full refnames (only globs use the
   abbreviated upstream), and dropped the old helper machinery, forward
   declaration, and string_list in favor of a strvec.
 * Replaced the boolean parameters of
   delete_branches()/check_branch_commit() with a single unsigned int flags.
 * --prune-merged now collects candidates via filter_refs() rather than its
   own branch walk.
 * --prune-merged now takes its patterns as positional arguments (e.g. git
   branch --prune-merged origin/main 'feature*') instead of repeating the
   option.
Changes in v12:
 * Reworked --forked from a standalone action into a --list-mode filter.
 * Switched --forked and --prune-merged to repeatable OPT_STRING_LIST
   options.
 * Dropped the bare-remote-name resolution for --forked, the argument is now
   a ref or a glob.
Changes in v11:
 * The flags now take a branch, not a remote. --forked and --prune-merged
   accept a literal upstream short name like origin/main or a wildmatch
   pattern like origin/. The old --all-remotes flag is gone, since origin/
   covers that case.
 * The prune guard now compares @{push} against @{upstream}. A branch is
   spared when these are equal. That is the trunk like case, such as local
   main tracking and pushing to origin/main, where "fully merged to
   upstream" cannot be told apart from "just pulled". Only branches that
   push somewhere other than their upstream, typically fork based topics,
   are candidates. The earlier /HEAD by name guard that the reviewer
   rejected is gone.
 * New --dry-run for --prune-merged.
Changes in v10:
 * --forked / --prune-merged now take a branch glob instead of a remote name
   — origin, origin/*, origin/release-- all work. This replaces the
   remote-only form and subsumes the old --all-remotes flag, which has been
   dropped.
 * New --dry-run for --prune-merged.
Changes in v9:
 * --force no longer has special meaning with --prune-merged; reachability
   is always enforced. Use git branch -D to delete an unmerged branch.
   Matches how git branch's other read/safe actions treat --force.
 * Synopsis drops [-f]; "not fully merged" hint points at git branch -D.
 * Dropped the --prune-merged --force tests.
Changes in v8:
 * Delete only when the branch's work is actually reachable from its
   upstream
 * Skip branches whose upstream is gone (even with --force)
 * Simplified the internal safety flag to live in one place
Changes in v7:
 * --prune-merged now checks if a branch is merged into its own upstream
   first. If the upstream is gone, it checks against the remote's default
   branch instead. If neither exists, the branch is refused (use --force to
   delete anyway).
Changes in v6:
 * --prune-merged now measures merged-ness against the remote's default
   branch instead of the candidate's upstream — so the decision no longer
   depends on which branch happens to be checked out locally.
 * delete_branches() / check_branch_commit() gained a per-candidate override
   that lets a caller substitute a different "what counts as merged"
   reference (or skip the check). branch -d callers pass NULL and keep their
   existing semantics.
 * prune_merged_branches() resolves each candidate's push-remote HEAD and
   threads it through, so --prune-merged --all-remotes measures each
   candidate against its own remote rather than a single global reference.
Changes in v5:
 * Drop commit 'fetch: add --prune-merged'
Changes in v4:
 * Resolve each remote's HEAD and collect the targets into a
   protected_default_refs set in collect_forked_set.
 * In prune_merged_branches, skip a candidate when its upstream is a
   protected default ref and the local branch name matches the default
   branch's leaf name (so a local main tracking origin/main is spared, but a
   renamed trunk tracking origin/main is not).
 * Also skip when the candidate's push ref points at a protected default
   ref, so a topic branch configured to push to origin/main is never pruned.
 * Tests: spare the local default branch; only protect by matching leaf name
   (not by upstream alone); spare a branch whose push ref is the remote
   default.
Changes in v3:
 * s/remote-tracking refs/remote-tracking branches/g
Changes in v2:
 * The whole feature moved out of git fetch and into git branch. git fetch
   --prune-merged now just calls git branch --prune-merged after fetching.
 * The fetch.pruneLocalBranches and remote..pruneLocalBranches config
   options are gone, replaced by per-branch opt-out via branch..pruneMerged.
 * New git branch --forked lists local branches whose upstream lives on the
   given remote (read-only building block).
 * New git branch --prune-merged deletes those branches, but only if their
   tip is reachable from the upstream tracking ref; --force skips that
   safety check.
 * New git branch --all-remotes lets --forked/--prune-merged operate across
   every configured remote at once.
 * The currently checked-out branch in any worktree is always preserved.
 * branch..pruneMerged=false lets you exempt a branch (e.g. a long-running
   topic branch) even with --force; doesn't affect explicit git branch -d.
 * delete_branches() got a warn_only mode so bulk deletion prints a one-line
   warning per skipped branch instead of the noisy four-line hint that git
   branch -d shows.
 * New section in git-branch docs; git-fetch docs trimmed to just mention
   --prune-merged.
 * New tests in t3200-branch.sh for the new branch flags; t5510-fetch.sh
   shrunk since most logic moved.
Harald Nordgren (7):
  branch: add --forked filter for --list mode
  branch: convert delete_branches() to a flags argument
  branch: let delete_branches skip unmerged branches on bulk refusal
  branch: prepare delete_branches for a bulk caller
  branch: add --delete-merged <branch>
  branch: add branch.<name>.deleteMerged opt-out
  branch: add --dry-run for --delete-merged
 Documentation/config/branch.adoc |   7 +
 Documentation/git-branch.adoc    |  43 ++++-
 builtin/branch.c                 | 186 ++++++++++++++++++----
 ref-filter.c                     |  70 +++++++++
 ref-filter.h                     |  10 ++
 t/t3200-branch.sh                | 262 +++++++++++++++++++++++++++++++
 6 files changed, 550 insertions(+), 28 deletions(-)
base-commit: 4621f8ce5e9b97aa2e8d0d9ffe9d25df2471074d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2285%2FHaraldNordgren%2Ffetch-prune-local-branches-v16
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2285/HaraldNordgren/fetch-prune-local-branches-v16
Pull-Request: https://github.com/git/git/pull/2285
Range-diff vs v15:
 1:  da741b5ea7 ! 1:  1f6a758265 branch: add --forked filter for --list mode
     @@ t/t3200-branch.sh: test_expect_success 'errors if given a bad branch name' '
       
      +test_expect_success '--forked: setup' '
      +	test_create_repo forked-upstream &&
     -+	test_commit -C forked-upstream base &&
     -+	git -C forked-upstream branch one base &&
     -+	git -C forked-upstream branch two base &&
     ++	(
     ++		cd forked-upstream &&
     ++		test_commit base &&
     ++		git branch one base &&
     ++		git branch two base
     ++	) &&
      +
      +	test_create_repo forked-other &&
     -+	test_commit -C forked-other other-base &&
     -+	git -C forked-other branch foreign other-base &&
     ++	(
     ++		cd forked-other &&
     ++		test_commit other-base &&
     ++		git branch foreign other-base
     ++	) &&
      +
      +	git clone forked-upstream forked &&
     -+	git -C forked remote add -f other ../forked-other &&
     -+	git -C forked remote set-head origin one &&
     -+	git -C forked branch local-base &&
     -+	git -C forked branch --track local-one origin/one &&
     -+	git -C forked branch --track local-two origin/two &&
     -+	git -C forked branch --track local-foreign other/foreign &&
     -+	git -C forked branch --track local-onbase local-base &&
     ++	(
     ++		cd forked &&
     ++		git remote add -f other ../forked-other &&
     ++		git remote set-head origin one &&
     ++		git branch local-base &&
     ++		git branch --track local-one origin/one &&
     ++		git branch --track local-two origin/two &&
     ++		git branch --track local-foreign other/foreign &&
     ++		git branch --track local-onbase local-base &&
      +
     -+	git -C forked checkout local-one &&
     -+	test_commit -C forked --no-tag local-one-work local-one.t &&
     -+	git -C forked checkout local-foreign &&
     -+	test_commit -C forked --no-tag local-foreign-work local-foreign.t &&
     -+	git -C forked checkout --detach
     ++		git checkout local-one &&
     ++		test_commit --no-tag local-one-work local-one.t &&
     ++		git checkout local-foreign &&
     ++		test_commit --no-tag local-foreign-work local-foreign.t &&
     ++		git checkout --detach
     ++	)
      +'
      +
      +test_expect_success '--forked <upstream-tracking-branch> filters by upstream' '
 2:  91c35f10cc = 2:  4f8af602ba branch: convert delete_branches() to a flags argument
 3:  e101dd2886 = 3:  efc891c255 branch: let delete_branches skip unmerged branches on bulk refusal
 4:  6c3534901a = 4:  b1ecd38fe3 branch: prepare delete_branches for a bulk caller
 5:  5899013b8f ! 5:  998fb6a68c branch: add --delete-merged <branch>
     @@ builtin/branch.c: static int parse_opt_forked(const struct option *opt, const ch
       }
       
      +static int delete_merged_branches(int argc, const char **argv,
     -+				 int quiet)
     ++				 unsigned int flags)
      +{
      +	struct ref_store *refs = get_main_ref_store(the_repository);
      +	struct ref_filter filter = REF_FILTER_INIT;
     @@ builtin/branch.c: static int parse_opt_forked(const struct option *opt, const ch
      +				      FILTER_REFS_BRANCHES,
      +				      DELETE_BRANCH_SKIP_UNMERGED |
      +				      DELETE_BRANCH_NO_HEAD_FALLBACK |
     -+				      (quiet ? DELETE_BRANCH_QUIET : 0));
     ++				      flags);
      +
      +	strvec_clear(&deletable);
      +	ref_array_clear(&candidates);
     @@ builtin/branch.c: int cmd_branch(int argc,
       				      (quiet ? DELETE_BRANCH_QUIET : 0));
       		goto out;
      +	} else if (delete_merged) {
     -+		ret = delete_merged_branches(argc, argv, quiet);
     ++		ret = delete_merged_branches(argc, argv,
     ++					     quiet ? DELETE_BRANCH_QUIET : 0);
      +		goto out;
       	} else if (show_current) {
       		print_current_branch_name();
     @@ t/t3200-branch.sh: test_expect_success '--forked narrows a <pattern> argument' '
       '
       
      +test_expect_success '--delete-merged: setup' '
     -+	test_create_repo pm-upstream &&
     -+	test_commit -C pm-upstream base &&
     -+	git -C pm-upstream checkout -b next &&
     -+	test_commit -C pm-upstream one-commit &&
     -+	test_commit -C pm-upstream two-commit &&
     -+	git -C pm-upstream branch one HEAD~ &&
     -+	git -C pm-upstream branch two HEAD &&
     -+	git -C pm-upstream branch wip main &&
     -+	git -C pm-upstream checkout main &&
     -+	test_create_repo pm-fork
     ++	git init -b main upstream &&
     ++	(
     ++		cd upstream &&
     ++		test_commit base &&
     ++		git checkout -b next &&
     ++		test_commit next-work &&
     ++		git checkout main
     ++	) &&
     ++	git init -b main other &&
     ++	test_commit -C other other-base &&
     ++	git init -b main fork
      +'
      +
     -+test_expect_success '--delete-merged deletes branches integrated into upstream' '
     -+	test_when_finished "rm -rf pm-merged" &&
     -+	git clone pm-upstream pm-merged &&
     -+	git -C pm-merged remote add fork ../pm-fork &&
     -+	test_config -C pm-merged remote.pushDefault fork &&
     -+	test_config -C pm-merged push.default current &&
     -+	git -C pm-merged branch one one-commit &&
     -+	git -C pm-merged branch --set-upstream-to=origin/next one &&
     -+	git -C pm-merged branch two two-commit &&
     -+	git -C pm-merged branch --set-upstream-to=origin/next two &&
     -+
     -+	git -C pm-merged branch --delete-merged "origin/*" &&
     -+
     -+	test_must_fail git -C pm-merged rev-parse --verify refs/heads/one &&
     -+	test_must_fail git -C pm-merged rev-parse --verify refs/heads/two
     -+'
     -+
     -+test_expect_success '--delete-merged accepts a literal upstream' '
     -+	test_when_finished "rm -rf pm-literal" &&
     -+	git clone pm-upstream pm-literal &&
     -+	git -C pm-literal remote add fork ../pm-fork &&
     -+	test_config -C pm-literal remote.pushDefault fork &&
     -+	test_config -C pm-literal push.default current &&
     -+	git -C pm-literal branch one one-commit &&
     -+	git -C pm-literal branch --set-upstream-to=origin/next one &&
     -+
     -+	git -C pm-literal branch --delete-merged origin/next &&
     -+
     -+	test_must_fail git -C pm-literal rev-parse --verify refs/heads/one
     -+'
     -+
     -+test_expect_success '--delete-merged unions multiple <branch> arguments' '
     -+	test_when_finished "rm -rf pm-union" &&
     -+	git clone pm-upstream pm-union &&
     -+	git -C pm-union remote add fork ../pm-fork &&
     -+	test_config -C pm-union remote.pushDefault fork &&
     -+	test_config -C pm-union push.default current &&
     -+	git -C pm-union branch one one-commit &&
     -+	git -C pm-union branch --set-upstream-to=origin/next one &&
     -+	git -C pm-union branch two base &&
     -+	git -C pm-union branch --set-upstream-to=origin/main two &&
     -+	git -C pm-union checkout --detach &&
     -+
     -+	git -C pm-union branch --delete-merged origin/next origin/main &&
     -+
     -+	test_must_fail git -C pm-union rev-parse --verify refs/heads/one &&
     -+	test_must_fail git -C pm-union rev-parse --verify refs/heads/two
     -+'
     -+
     -+test_expect_success '--delete-merged accepts a local upstream' '
     -+	test_when_finished "rm -rf pm-local" &&
     -+	git clone pm-upstream pm-local &&
     -+	git -C pm-local remote add fork ../pm-fork &&
     -+	test_config -C pm-local remote.pushDefault fork &&
     -+	test_config -C pm-local push.default current &&
     -+	git -C pm-local checkout -b mainline &&
     -+	git -C pm-local branch one one-commit &&
     -+	git -C pm-local branch --set-upstream-to=mainline one &&
     -+	git -C pm-local merge --ff-only one-commit &&
     -+
     -+	git -C pm-local branch --delete-merged mainline &&
     -+
     -+	test_must_fail git -C pm-local rev-parse --verify refs/heads/one
     -+'
     -+
     -+test_expect_success '--delete-merged silently skips un-integrated commits' '
     -+	test_when_finished "rm -rf pm-unmerged" &&
     -+	git clone pm-upstream pm-unmerged &&
     -+	git -C pm-unmerged remote add fork ../pm-fork &&
     -+	test_config -C pm-unmerged remote.pushDefault fork &&
     -+	test_config -C pm-unmerged push.default current &&
     -+	git -C pm-unmerged checkout -b wip origin/wip &&
     -+	git -C pm-unmerged branch --set-upstream-to=origin/next wip &&
     -+	test_commit -C pm-unmerged local-only &&
     -+	git -C pm-unmerged checkout - &&
     -+
     -+	git -C pm-unmerged branch --delete-merged "origin/*" 2>err &&
     -+	test_grep ! "not fully merged" err &&
     -+	git -C pm-unmerged rev-parse --verify refs/heads/wip
     -+'
     -+
     -+test_expect_success '--delete-merged is silent about not-merged-to-HEAD' '
     -+	test_when_finished "rm -rf pm-nohead" &&
     -+	git clone pm-upstream pm-nohead &&
     -+	git -C pm-nohead remote add fork ../pm-fork &&
     -+	test_config -C pm-nohead remote.pushDefault fork &&
     -+	test_config -C pm-nohead push.default current &&
     -+	git -C pm-nohead branch topic one-commit &&
     -+	git -C pm-nohead branch --set-upstream-to=origin/next topic &&
     -+
     -+	git -C pm-nohead branch --delete-merged "origin/*" 2>err &&
     -+
     -+	test_grep ! "not yet merged to HEAD" err &&
     -+	test_must_fail git -C pm-nohead rev-parse --verify refs/heads/topic
     -+'
     -+
     -+test_expect_success '--delete-merged skips branches whose upstream is gone' '
     -+	test_when_finished "rm -rf pm-upstream-gone" &&
     -+	git clone pm-upstream pm-upstream-gone &&
     -+	git -C pm-upstream-gone remote add fork ../pm-fork &&
     -+	test_config -C pm-upstream-gone remote.pushDefault fork &&
     -+	test_config -C pm-upstream-gone push.default current &&
     -+	git -C pm-upstream-gone branch one one-commit &&
     -+	git -C pm-upstream-gone branch --set-upstream-to=origin/next one &&
     -+
     -+	git -C pm-upstream-gone update-ref -d refs/remotes/origin/next &&
     -+	git -C pm-upstream-gone branch --delete-merged "origin/*" &&
     -+
     -+	git -C pm-upstream-gone rev-parse --verify refs/heads/one
     -+'
     -+
     -+test_expect_success '--delete-merged never deletes the checked-out branch' '
     -+	test_when_finished "rm -rf pm-head" &&
     -+	git clone pm-upstream pm-head &&
     -+	git -C pm-head remote add fork ../pm-fork &&
     -+	test_config -C pm-head remote.pushDefault fork &&
     -+	test_config -C pm-head push.default current &&
     -+	git -C pm-head checkout -b one one-commit &&
     -+	git -C pm-head branch --set-upstream-to=origin/next one &&
     -+
     -+	git -C pm-head branch --delete-merged "origin/*" &&
     -+
     -+	git -C pm-head rev-parse --verify refs/heads/one
     -+'
     -+
     -+test_expect_success '--delete-merged spares branches that push back to their upstream' '
     -+	test_when_finished "rm -rf pm-push-eq" &&
     -+	git clone pm-upstream pm-push-eq &&
     -+	git -C pm-push-eq checkout --detach &&
     -+
     -+	git -C pm-push-eq branch --delete-merged "origin/*" &&
     -+
     -+	git -C pm-push-eq rev-parse --verify refs/heads/main
     -+'
     -+
     -+test_expect_success '--delete-merged spares a per-branch pushRemote==upstream remote' '
     -+	test_when_finished "rm -rf pm-push-branch" &&
     -+	git clone pm-upstream pm-push-branch &&
     -+	git -C pm-push-branch remote add fork ../pm-fork &&
     -+	test_config -C pm-push-branch remote.pushDefault fork &&
     -+	test_config -C pm-push-branch push.default current &&
     -+	test_config -C pm-push-branch branch.main.pushRemote origin &&
     -+	git -C pm-push-branch checkout --detach &&
     ++setup_repo_for_delete_merged () {
     ++	rm -rf repo &&
     ++	git clone upstream repo &&
     ++	(
     ++		cd repo &&
     ++		git remote add fork ../fork &&
     ++		git remote add other ../other &&
     ++		git config remote.pushDefault fork &&
     ++		git config push.default current &&
     ++		git fetch other
     ++	)
     ++}
      +
     -+	git -C pm-push-branch branch --delete-merged "origin/*" &&
     ++merged_branch () {
     ++	(
     ++		cd repo &&
     ++		git checkout -b "$1" "$2" &&
     ++		git commit --allow-empty -m "$1 work" &&
     ++		git push origin "$1:next" &&
     ++		git fetch origin &&
     ++		git branch --set-upstream-to="$2" "$1"
     ++	)
     ++}
      +
     -+	git -C pm-push-branch rev-parse --verify refs/heads/main
     ++test_expect_success '--delete-merged deletes merged branches and spares the rest' '
     ++	test_when_finished "rm -rf repo" &&
     ++	setup_repo_for_delete_merged &&
     ++	merged_branch merged origin/next &&
     ++	(
     ++		cd repo &&
     ++		git checkout -b unmerged origin/next &&
     ++		git commit --allow-empty -m "unmerged work" &&
     ++		git branch --set-upstream-to=origin/next unmerged &&
     ++		git checkout -b tracks-other other/main &&
     ++		git branch --set-upstream-to=other/main tracks-other &&
     ++		git checkout --detach
     ++	) &&
     ++	sha=$(git -C repo rev-parse --short merged) &&
     ++
     ++	git -C repo branch --delete-merged origin/next >actual 2>&1 &&
     ++
     ++	echo "Deleted branch merged (was $sha)." >expect &&
     ++	test_cmp expect actual &&
     ++	git -C repo for-each-ref --format="%(refname:short)" refs/heads/ >actual &&
     ++	cat >expect <<-\EOF &&
     ++	main
     ++	tracks-other
     ++	unmerged
     ++	EOF
     ++	test_cmp expect actual
      +'
      +
     -+test_expect_success '--delete-merged prunes when @{push} differs from @{upstream}' '
     -+	test_when_finished "rm -rf pm-push-diff" &&
     -+	git clone pm-upstream pm-push-diff &&
     -+	git -C pm-push-diff remote add fork ../pm-fork &&
     -+	test_config -C pm-push-diff remote.pushDefault fork &&
     -+	test_config -C pm-push-diff push.default current &&
     -+	git -C pm-push-diff branch topic one-commit &&
     -+	git -C pm-push-diff branch --set-upstream-to=origin/next topic &&
     -+	git -C pm-push-diff checkout --detach &&
     -+
     -+	git -C pm-push-diff branch --delete-merged "origin/*" &&
     -+
     -+	test_must_fail git -C pm-push-diff rev-parse --verify refs/heads/topic
     ++test_expect_success '--delete-merged deletes merged branches and spares protected ones' '
     ++	test_when_finished "rm -rf repo" &&
     ++	setup_repo_for_delete_merged &&
     ++	merged_branch on-next origin/next &&
     ++	merged_branch checked-out origin/next &&
     ++	merged_branch upstream-gone origin/next &&
     ++	(
     ++		cd repo &&
     ++		git checkout -b mainline main &&
     ++		git checkout -b on-local mainline &&
     ++		git branch --set-upstream-to=mainline on-local &&
     ++		git update-ref refs/remotes/origin/topic refs/remotes/origin/next &&
     ++		git branch --set-upstream-to=origin/topic upstream-gone &&
     ++		git update-ref -d refs/remotes/origin/topic &&
     ++		git branch --set-upstream-to=origin/main main &&
     ++		git config branch.main.pushRemote origin &&
     ++		git checkout -b tracks-other other/main &&
     ++		git branch --set-upstream-to=other/main tracks-other &&
     ++		git checkout checked-out
     ++	) &&
     ++
     ++	git -C repo branch --delete-merged origin/next mainline &&
     ++
     ++	git -C repo for-each-ref --format="%(refname:short)" refs/heads/ >actual &&
     ++	cat >expect <<-\EOF &&
     ++	checked-out
     ++	main
     ++	mainline
     ++	tracks-other
     ++	upstream-gone
     ++	EOF
     ++	test_cmp expect actual
      +'
      +
      +test_expect_success '--delete-merged requires at least one <branch>' '
      +	test_must_fail git -C forked branch --delete-merged 2>err &&
      +	test_grep "requires at least one <branch>" err
      +'
     -+
     -+test_expect_success '--delete-merged takes positional <branch> arguments' '
     -+	test_when_finished "rm -rf pm-positional" &&
     -+	git clone pm-upstream pm-positional &&
     -+	git -C pm-positional remote add fork ../pm-fork &&
     -+	test_config -C pm-positional remote.pushDefault fork &&
     -+	test_config -C pm-positional push.default current &&
     -+	git -C pm-positional branch one one-commit &&
     -+	git -C pm-positional branch --set-upstream-to=origin/next one &&
     -+	git -C pm-positional branch two base &&
     -+	git -C pm-positional branch --set-upstream-to=origin/main two &&
     -+	git -C pm-positional checkout --detach &&
     -+
     -+	git -C pm-positional branch --delete-merged origin/next origin/main &&
     -+
     -+	test_must_fail git -C pm-positional rev-parse --verify refs/heads/one &&
     -+	test_must_fail git -C pm-positional rev-parse --verify refs/heads/two
     -+'
      +
       test_done
 6:  72aaca0666 ! 6:  a27d2724a2 branch: add branch.<name>.deleteMerged opt-out
     @@ Documentation/git-branch.adoc: A branch is not deleted when:
       A branch whose work has not yet been merged into its upstream is
      
       ## builtin/branch.c ##
     +@@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
     + 	struct ref_filter filter = REF_FILTER_INIT;
     + 	struct ref_array candidates = { 0 };
     + 	struct strvec deletable = STRVEC_INIT;
     ++	struct strbuf key = STRBUF_INIT;
     ++	bool quiet = flags & DELETE_BRANCH_QUIET;
     + 	int i, ret = 0;
     + 
     + 	if (!argc)
      @@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
       		const char *short_name;
       		struct branch *branch;
       		const char *upstream, *push;
     -+		struct strbuf key = STRBUF_INIT;
      +		int opt_out;
       
       		if (!skip_prefix(full_name, "refs/heads/", &short_name))
     @@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
       		if (!push || !strcmp(push, upstream))
       			continue;
       
     ++		strbuf_reset(&key);
      +		strbuf_addf(&key, "branch.%s.deletemerged", short_name);
      +		if (!repo_config_get_bool(the_repository, key.buf, &opt_out) &&
      +		    !opt_out) {
     @@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
      +				fprintf(stderr,
      +					_("Skipping '%s' (branch.%s.deleteMerged is false)\n"),
      +					short_name, short_name);
     -+			strbuf_release(&key);
      +			continue;
      +		}
     -+		strbuf_release(&key);
      +
       		strvec_push(&deletable, short_name);
       	}
       
     +@@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
     + 				      DELETE_BRANCH_NO_HEAD_FALLBACK |
     + 				      flags);
     + 
     ++	strbuf_release(&key);
     + 	strvec_clear(&deletable);
     + 	ref_array_clear(&candidates);
     + 	ref_filter_clear(&filter);
      
       ## t/t3200-branch.sh ##
     -@@ t/t3200-branch.sh: test_expect_success '--delete-merged takes positional <branch> arguments' '
     - 	test_must_fail git -C pm-positional rev-parse --verify refs/heads/two
     +@@ t/t3200-branch.sh: test_expect_success '--delete-merged requires at least one <branch>' '
     + 	test_grep "requires at least one <branch>" err
       '
       
      +test_expect_success '--delete-merged honours branch.<name>.deleteMerged=false' '
     -+	test_when_finished "rm -rf pm-optout" &&
     -+	git clone pm-upstream pm-optout &&
     -+	git -C pm-optout remote add fork ../pm-fork &&
     -+	test_config -C pm-optout remote.pushDefault fork &&
     -+	test_config -C pm-optout push.default current &&
     -+	git -C pm-optout branch one one-commit &&
     -+	git -C pm-optout branch --set-upstream-to=origin/next one &&
     -+	git -C pm-optout branch two two-commit &&
     -+	git -C pm-optout branch --set-upstream-to=origin/next two &&
     -+	test_config -C pm-optout branch.one.deleteMerged false &&
     ++	test_when_finished "rm -rf repo" &&
     ++	setup_repo_for_delete_merged &&
     ++	merged_branch deleted origin/next &&
     ++	merged_branch kept origin/next &&
     ++	git -C repo config branch.kept.deleteMerged false &&
     ++	git -C repo checkout --detach &&
      +
     -+	git -C pm-optout branch --delete-merged "origin/*" 2>err &&
     ++	git -C repo branch --delete-merged origin/next 2>err &&
      +
     -+	git -C pm-optout rev-parse --verify refs/heads/one &&
     -+	test_must_fail git -C pm-optout rev-parse --verify refs/heads/two &&
     -+	test_grep "Skipping .one." err
     ++	test_grep "Skipping .kept." err &&
     ++	test_must_fail git -C repo rev-parse --verify refs/heads/deleted &&
     ++	git -C repo rev-parse --verify refs/heads/kept
      +'
      +
     -+test_expect_success 'branch -d still deletes a deleteMerged=false branch' '
     -+	test_when_finished "rm -rf pm-optout-d" &&
     -+	git clone pm-upstream pm-optout-d &&
     -+	git -C pm-optout-d branch one one-commit &&
     -+	git -C pm-optout-d branch --set-upstream-to=origin/next one &&
     -+	test_config -C pm-optout-d branch.one.deleteMerged false &&
     ++test_expect_success "branch -d still deletes a deleteMerged=false branch" '
     ++	test_when_finished "rm -rf repo" &&
     ++	setup_repo_for_delete_merged &&
     ++	merged_branch kept origin/next &&
     ++	git -C repo config branch.kept.deleteMerged false &&
     ++	git -C repo checkout --detach &&
      +
     -+	git -C pm-optout-d branch -d one &&
     -+	test_must_fail git -C pm-optout-d rev-parse --verify refs/heads/one
     ++	git -C repo branch -d kept &&
     ++	test_must_fail git -C repo rev-parse --verify refs/heads/kept
      +'
      +
       test_done
 7:  7b2b01b988 ! 7:  6d5c52353e branch: add --dry-run for --delete-merged
     @@ Documentation/git-branch.adoc: A branch whose work has not yet been merged into
       `--verbose`::
      
       ## builtin/branch.c ##
     -@@ builtin/branch.c: static int parse_opt_forked(const struct option *opt, const char *arg, int unset
     - }
     - 
     - static int delete_merged_branches(int argc, const char **argv,
     --				 int quiet)
     -+				 int quiet, int dry_run)
     - {
     - 	struct ref_store *refs = get_main_ref_store(the_repository);
     - 	struct ref_filter filter = REF_FILTER_INIT;
     -@@ builtin/branch.c: static int delete_merged_branches(int argc, const char **argv,
     - 				      FILTER_REFS_BRANCHES,
     - 				      DELETE_BRANCH_SKIP_UNMERGED |
     - 				      DELETE_BRANCH_NO_HEAD_FALLBACK |
     --				      (quiet ? DELETE_BRANCH_QUIET : 0));
     -+				      (quiet ? DELETE_BRANCH_QUIET : 0) |
     -+				      (dry_run ? DELETE_BRANCH_DRY_RUN : 0));
     - 
     - 	strvec_clear(&deletable);
     - 	ref_array_clear(&candidates);
      @@ builtin/branch.c: int cmd_branch(int argc,
       	int delete = 0, rename = 0, copy = 0, list = 0,
       	    unset_upstream = 0, show_current = 0, edit_description = 0;
     @@ builtin/branch.c: int cmd_branch(int argc,
       		if (!submodule_propagate_branches)
       			die(_("branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled"));
      @@ builtin/branch.c: int cmd_branch(int argc,
     - 				      (quiet ? DELETE_BRANCH_QUIET : 0));
       		goto out;
       	} else if (delete_merged) {
     --		ret = delete_merged_branches(argc, argv, quiet);
     -+		ret = delete_merged_branches(argc, argv, quiet, dry_run);
     + 		ret = delete_merged_branches(argc, argv,
     +-					     quiet ? DELETE_BRANCH_QUIET : 0);
     ++					     (quiet ? DELETE_BRANCH_QUIET : 0) |
     ++					     (dry_run ? DELETE_BRANCH_DRY_RUN : 0));
       		goto out;
       	} else if (show_current) {
       		print_current_branch_name();
      
       ## t/t3200-branch.sh ##
     -@@ t/t3200-branch.sh: test_expect_success 'branch -d still deletes a deleteMerged=false branch' '
     - 	test_must_fail git -C pm-optout-d rev-parse --verify refs/heads/one
     +@@ t/t3200-branch.sh: test_expect_success '--delete-merged deletes merged branches and spares the rest
     + 	) &&
     + 	sha=$(git -C repo rev-parse --short merged) &&
     + 
     +-	git -C repo branch --delete-merged origin/next >actual 2>&1 &&
     ++	git -C repo branch --dry-run --delete-merged origin/next >actual 2>&1 &&
     ++	echo "Would delete branch merged (was $sha)." >expect &&
     ++	test_cmp expect actual &&
     ++	git -C repo rev-parse --verify refs/heads/merged &&
     + 
     ++	git -C repo branch --delete-merged origin/next >actual 2>&1 &&
     + 	echo "Deleted branch merged (was $sha)." >expect &&
     + 	test_cmp expect actual &&
     + 	git -C repo for-each-ref --format="%(refname:short)" refs/heads/ >actual &&
     +@@ t/t3200-branch.sh: test_expect_success "branch -d still deletes a deleteMerged=false branch" '
     + 	test_must_fail git -C repo rev-parse --verify refs/heads/kept
       '
       
     -+test_expect_success '--delete-merged --dry-run lists but does not delete' '
     -+	test_when_finished "rm -rf pm-dry" &&
     -+	git clone pm-upstream pm-dry &&
     -+	git -C pm-dry remote add fork ../pm-fork &&
     -+	test_config -C pm-dry remote.pushDefault fork &&
     -+	test_config -C pm-dry push.default current &&
     -+	git -C pm-dry branch one one-commit &&
     -+	git -C pm-dry branch --set-upstream-to=origin/next one &&
     -+	git -C pm-dry branch two two-commit &&
     -+	git -C pm-dry branch --set-upstream-to=origin/next two &&
     -+
     -+	git -C pm-dry branch --dry-run --delete-merged "origin/*" >actual &&
     -+	test_grep "Would delete branch one " actual &&
     -+	test_grep "Would delete branch two " actual &&
     -+
     -+	git -C pm-dry rev-parse --verify refs/heads/one &&
     -+	git -C pm-dry rev-parse --verify refs/heads/two
     -+'
     -+
     -+test_expect_success '--delete-merged --dry-run only lists branches the live run would delete' '
     -+	test_when_finished "rm -rf pm-dry-mixed" &&
     -+	git clone pm-upstream pm-dry-mixed &&
     -+	git -C pm-dry-mixed remote add fork ../pm-fork &&
     -+	test_config -C pm-dry-mixed remote.pushDefault fork &&
     -+	test_config -C pm-dry-mixed push.default current &&
     -+	git -C pm-dry-mixed checkout -b wip origin/next &&
     -+	git -C pm-dry-mixed branch --set-upstream-to=origin/next wip &&
     -+	test_commit -C pm-dry-mixed local-only &&
     -+	git -C pm-dry-mixed checkout - &&
     -+	git -C pm-dry-mixed branch merged one-commit &&
     -+	git -C pm-dry-mixed branch --set-upstream-to=origin/next merged &&
     -+
     -+	git -C pm-dry-mixed branch --dry-run --delete-merged "origin/*" >out &&
     -+	test_grep "Would delete branch merged" out &&
     -+	test_grep ! "Would delete branch wip" out &&
     -+	git -C pm-dry-mixed rev-parse --verify refs/heads/wip &&
     -+	git -C pm-dry-mixed rev-parse --verify refs/heads/merged
     -+'
     -+
      +test_expect_success '--dry-run without --delete-merged is rejected' '
      +	test_must_fail git -C forked branch --dry-run 2>err &&
      +	test_grep "requires --delete-merged" err
-- 
gitgitgadget
Previous: Harald NordgrenNext: Harald Nordgren via GitGitGadget
Message 174 of 292 in “fetch: add fetch.pruneLocalBranches config”
  1. fetch: add fetch.pruneLocalBranches configHarald Nordgren via GitGitGadget, May 1, 2026
  2. Junio C HamanoMay 3, 2026
  3. checkout: add --autostash option for branch switchingHarald Nordgren, May 4, 2026
  4. Junio C HamanoMay 10, 2026
  5. Johannes SixtMay 5, 2026
  6. 0/6 fetch: add fetch.pruneBranches configHarald Nordgren via GitGitGadget, May 4, 2026
  7. 1/6 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 4, 2026
  8. Kristoffer HaugsbakkMay 4, 2026
  9. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 4, 2026
  10. 3/6 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 4, 2026
  11. 4/6 fetch: add --prune-mergedHarald Nordgren via GitGitGadget, May 4, 2026
  12. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 4, 2026
  13. 6/6 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 4, 2026
  14. 0/6 fetch: add fetch.pruneBranches configHarald Nordgren via GitGitGadget, May 5, 2026
  15. 1/6 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 5, 2026
  16. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 5, 2026
  17. 3/6 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 5, 2026
  18. 4/6 fetch: add --prune-mergedHarald Nordgren via GitGitGadget, May 5, 2026
  19. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 5, 2026
  20. 6/6 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 5, 2026
  21. 0/6 fetch: add fetch.pruneBranches configHarald Nordgren via GitGitGadget, May 5, 2026
  22. 1/6 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 5, 2026
  23. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 5, 2026
  24. 3/6 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 5, 2026
  25. 4/6 fetch: add --prune-mergedHarald Nordgren via GitGitGadget, May 5, 2026
  26. Johannes SixtMay 5, 2026
  27. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 5, 2026
  28. Junio C HamanoMay 11, 2026
  29. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 11, 2026
  30. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 5, 2026
  31. 6/6 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 5, 2026
  32. 0/6 fetch: add fetch.pruneBranches configHarald Nordgren, May 7, 2026
  33. 0/5 branch: prune-mergedHarald Nordgren via GitGitGadget, May 11, 2026
  34. 1/5 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 11, 2026
  35. 2/5 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 11, 2026
  36. Junio C HamanoMay 11, 2026
  37. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 11, 2026
  38. 3/5 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 11, 2026
  39. 4/5 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 11, 2026
  40. 5/5 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 11, 2026
  41. 0/5 branch: prune-mergedHarald Nordgren via GitGitGadget, May 11, 2026
  42. 1/5 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 11, 2026
  43. 2/5 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 11, 2026
  44. 3/5 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 11, 2026
  45. 4/5 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 11, 2026
  46. 5/5 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 11, 2026
  47. Junio C HamanoMay 11, 2026
  48. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 12, 2026
  49. 0/5 branch: prune-mergedHarald Nordgren via GitGitGadget, May 12, 2026
  50. 1/5 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 12, 2026
  51. 2/5 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 12, 2026
  52. 3/5 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 12, 2026
  53. Junio C HamanoMay 12, 2026
  54. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 12, 2026
  55. 4/5 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 12, 2026
  56. 5/5 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 12, 2026
  57. 0/5 branch: prune-mergedHarald Nordgren via GitGitGadget, May 12, 2026
  58. 1/5 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 12, 2026
  59. 2/5 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 12, 2026
  60. 3/5 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 12, 2026
  61. 4/5 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 12, 2026
  62. 5/5 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 12, 2026
  63. Junio C HamanoMay 13, 2026
  64. fetch: add fetch.pruneLocalBranches configHarald Nordgren, May 13, 2026
  65. 0/5 branch: prune-mergedHarald Nordgren via GitGitGadget, May 13, 2026
  66. 1/5 branch: add --forked <remote>Harald Nordgren via GitGitGadget, May 13, 2026
  67. 2/5 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 13, 2026
  68. 4/5 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 13, 2026
  69. 5/5 branch: add --all-remotes flagHarald Nordgren via GitGitGadget, May 13, 2026
  70. Phillip WoodMay 18, 2026
  71. 3/5 branch: add --prune-merged <remote>Harald Nordgren via GitGitGadget, May 13, 2026
  72. Phillip WoodMay 18, 2026
  73. Phillip WoodMay 21, 2026
  74. Harald NordgrenMay 21, 2026
  75. Phillip WoodMay 22, 2026
  76. Harald NordgrenMay 22, 2026
  77. Harald NordgrenMay 21, 2026
  78. Junio C HamanoMay 21, 2026
  79. Harald NordgrenMay 18, 2026
  80. 0/4 branch: prune-mergedHarald Nordgren via GitGitGadget, May 21, 2026
  81. 1/4 branch: add --forked <branch>Harald Nordgren via GitGitGadget, May 21, 2026
  82. Junio C HamanoMay 22, 2026
  83. Johannes SixtMay 22, 2026
  84. Junio C HamanoMay 22, 2026
  85. Harald NordgrenMay 22, 2026
  86. Johannes SixtMay 22, 2026
  87. 2/4 branch: add --prune-merged <branch>Harald Nordgren via GitGitGadget, May 21, 2026
  88. Junio C HamanoMay 22, 2026
  89. Junio C HamanoMay 22, 2026
  90. Junio C HamanoMay 22, 2026
  91. Harald NordgrenMay 22, 2026
  92. Junio C HamanoMay 22, 2026
  93. Junio C HamanoMay 22, 2026
  94. 3/4 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 21, 2026
  95. 4/4 branch: add --dry-run for --prune-mergedHarald Nordgren via GitGitGadget, May 21, 2026
  96. 0/6 branch: prune-mergedHarald Nordgren via GitGitGadget, May 22, 2026
  97. 1/6 branch: add --forked <branch>Harald Nordgren via GitGitGadget, May 22, 2026
  98. 3/6 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, May 22, 2026
  99. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, May 22, 2026
  100. 6/6 branch: add --dry-run for --prune-mergedHarald Nordgren via GitGitGadget, May 22, 2026
  101. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, May 22, 2026
  102. 4/6 branch: add --prune-merged <branch>Harald Nordgren via GitGitGadget, May 22, 2026
  103. Phillip WoodJun 2, 2026
  104. Harald NordgrenJun 2, 2026
  105. 0/6 branch: prune-mergedHarald Nordgren via GitGitGadget, Jun 3, 2026
  106. 1/6 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 3, 2026
  107. Phillip WoodJun 5, 2026
  108. Harald NordgrenJun 5, 2026
  109. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, Jun 3, 2026
  110. Phillip WoodJun 5, 2026
  111. 3/6 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 3, 2026
  112. Phillip WoodJun 5, 2026
  113. 4/6 branch: add --prune-merged <branch>Harald Nordgren via GitGitGadget, Jun 3, 2026
  114. Phillip WoodJun 5, 2026
  115. Phillip WoodJun 5, 2026
  116. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, Jun 3, 2026
  117. 6/6 branch: add --dry-run for --prune-mergedHarald Nordgren via GitGitGadget, Jun 3, 2026
  118. 0/6 branch: prune-mergedHarald Nordgren via GitGitGadget, Jun 5, 2026
  119. 1/6 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 5, 2026
  120. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, Jun 5, 2026
  121. Junio C HamanoJun 8, 2026
  122. Harald NordgrenJun 9, 2026
  123. Junio C HamanoJun 9, 2026
  124. Harald NordgrenJun 9, 2026
  125. 3/6 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 5, 2026
  126. 4/6 branch: add --prune-merged <branch>Harald Nordgren via GitGitGadget, Jun 5, 2026
  127. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, Jun 5, 2026
  128. 6/6 branch: add --dry-run for --prune-mergedHarald Nordgren via GitGitGadget, Jun 5, 2026
  129. 0/6 branch: prune-mergedHarald Nordgren via GitGitGadget, Jun 9, 2026
  130. 1/6 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 9, 2026
  131. Phillip WoodJun 15, 2026
  132. 2/6 branch: let delete_branches warn instead of error on bulk refusalHarald Nordgren via GitGitGadget, Jun 9, 2026
  133. Phillip WoodJun 9, 2026
  134. 3/6 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 9, 2026
  135. Phillip WoodJun 15, 2026
  136. 4/6 branch: add --prune-merged <branch>Harald Nordgren via GitGitGadget, Jun 9, 2026
  137. Phillip WoodJun 15, 2026
  138. Phillip WoodJun 16, 2026
  139. Harald NordgrenJun 16, 2026
  140. Phillip WoodJun 18, 2026
  141. Junio C HamanoJun 18, 2026
  142. Phillip WoodJun 19, 2026
  143. Junio C HamanoJun 19, 2026
  144. Junio C HamanoJun 19, 2026
  145. Harald NordgrenJun 20, 2026
  146. Harald NordgrenJun 21, 2026
  147. Phillip WoodJun 22, 2026
  148. Phillip WoodJun 22, 2026
  149. Harald NordgrenJun 22, 2026
  150. Phillip WoodJun 22, 2026
  151. Harald NordgrenJun 22, 2026
  152. Phillip WoodJun 22, 2026
  153. Phillip WoodJun 22, 2026
  154. Junio C HamanoJun 22, 2026
  155. 5/6 branch: add branch.<name>.pruneMerged opt-outHarald Nordgren via GitGitGadget, Jun 9, 2026
  156. Phillip WoodJun 16, 2026
  157. 6/6 branch: add --dry-run for --prune-mergedHarald Nordgren via GitGitGadget, Jun 9, 2026
  158. Phillip WoodJun 16, 2026
  159. Harald NordgrenJun 16, 2026
  160. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jun 15, 2026
  161. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 15, 2026
  162. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jun 15, 2026
  163. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jun 15, 2026
  164. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 15, 2026
  165. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jun 15, 2026
  166. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jun 15, 2026
  167. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jun 15, 2026
  168. Phillip WoodJun 17, 2026
  169. Harald NordgrenJun 17, 2026
  170. Phillip WoodJun 17, 2026
  171. Harald NordgrenJun 17, 2026
  172. Phillip WoodJun 18, 2026
  173. Harald NordgrenJun 18, 2026
  174. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jun 18, 2026
  175. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 18, 2026
  176. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jun 18, 2026
  177. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jun 18, 2026
  178. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 18, 2026
  179. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jun 18, 2026
  180. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jun 18, 2026
  181. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jun 18, 2026
  182. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jun 22, 2026
  183. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 22, 2026
  184. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jun 22, 2026
  185. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jun 22, 2026
  186. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 22, 2026
  187. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jun 22, 2026
  188. Phillip WoodJun 22, 2026
  189. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jun 22, 2026
  190. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jun 22, 2026
  191. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jun 24, 2026
  192. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jun 24, 2026
  193. Phillip WoodJul 10, 2026
  194. Harald NordgrenJul 11, 2026
  195. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jun 24, 2026
  196. Phillip WoodJul 10, 2026
  197. Harald NordgrenJul 10, 2026
  198. Phillip WoodJul 13, 2026
  199. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jun 24, 2026
  200. Phillip WoodJul 10, 2026
  201. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jun 24, 2026
  202. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jun 24, 2026
  203. Phillip WoodJul 13, 2026
  204. Harald NordgrenJul 13, 2026
  205. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jun 24, 2026
  206. Phillip WoodJul 13, 2026
  207. Harald NordgrenJul 13, 2026
  208. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jun 24, 2026
  209. Phillip WoodJul 10, 2026
  210. Harald NordgrenJul 11, 2026
  211. Harald NordgrenJul 11, 2026
  212. Phillip WoodJul 13, 2026
  213. Phillip WoodJul 13, 2026
  214. Harald NordgrenJul 13, 2026
  215. Phillip WoodJul 14, 2026
  216. Harald NordgrenJul 14, 2026
  217. Phillip WoodJul 10, 2026
  218. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 14, 2026
  219. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 14, 2026
  220. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 14, 2026
  221. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 14, 2026
  222. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 14, 2026
  223. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jul 14, 2026
  224. Junio C HamanoJul 19, 2026
  225. Harald NordgrenJul 19, 2026
  226. Junio C HamanoJul 19, 2026
  227. Phillip WoodJul 19, 2026
  228. Junio C HamanoJul 19, 2026
  229. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 14, 2026
  230. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 14, 2026
  231. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 22, 2026
  232. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 22, 2026
  233. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 22, 2026
  234. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 22, 2026
  235. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 22, 2026
  236. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jul 22, 2026
  237. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 22, 2026
  238. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 22, 2026
  239. Phillip WoodJul 22, 2026
  240. Harald NordgrenJul 22, 2026
  241. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 24, 2026
  242. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 24, 2026
  243. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 24, 2026
  244. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 24, 2026
  245. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 24, 2026
  246. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jul 24, 2026
  247. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 24, 2026
  248. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 24, 2026
  249. Junio C HamanoJul 24, 2026
  250. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 24, 2026
  251. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 24, 2026
  252. Junio C HamanoJul 25, 2026
  253. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 24, 2026
  254. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 24, 2026
  255. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 24, 2026
  256. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jul 24, 2026
  257. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 24, 2026
  258. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 24, 2026
  259. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 25, 2026
  260. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 25, 2026
  261. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 25, 2026
  262. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 25, 2026
  263. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 25, 2026
  264. 5/7 branch: add --delete-merged <branch>Harald Nordgren via GitGitGadget, Jul 25, 2026
  265. Phillip WoodJul 29, 2026
  266. Harald NordgrenJul 29, 2026
  267. Phillip WoodJul 30, 2026
  268. Harald NordgrenJul 30, 2026
  269. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 25, 2026
  270. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 25, 2026
  271. Junio C HamanoJul 25, 2026
  272. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Jul 30, 2026
  273. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Jul 30, 2026
  274. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Jul 30, 2026
  275. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Jul 30, 2026
  276. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Jul 30, 2026
  277. 5/7 branch: add --delete-merged <pattern>Harald Nordgren via GitGitGadget, Jul 30, 2026
  278. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Jul 30, 2026
  279. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Jul 30, 2026
  280. Phillip WoodAug 4, 2026
  281. Harald NordgrenAug 4, 2026
  282. Junio C HamanoAug 4, 2026
  283. 0/7 branch: delete-mergedHarald Nordgren via GitGitGadget, Aug 5, 2026
  284. 1/7 branch: add --forked filter for --list modeHarald Nordgren via GitGitGadget, Aug 5, 2026
  285. 3/7 branch: let delete_branches skip unmerged branches on bulk refusalHarald Nordgren via GitGitGadget, Aug 5, 2026
  286. 2/7 branch: convert delete_branches() to a flags argumentHarald Nordgren via GitGitGadget, Aug 5, 2026
  287. 4/7 branch: prepare delete_branches for a bulk callerHarald Nordgren via GitGitGadget, Aug 5, 2026
  288. 5/7 branch: add --delete-merged <pattern>Harald Nordgren via GitGitGadget, Aug 5, 2026
  289. 6/7 branch: add branch.<name>.deleteMerged opt-outHarald Nordgren via GitGitGadget, Aug 5, 2026
  290. 7/7 branch: add --dry-run for --delete-mergedHarald Nordgren via GitGitGadget, Aug 5, 2026
  291. Junio C HamanoAug 6, 2026
  292. Phillip WoodAug 7, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.