From: Harald Nordgren via GitGitGadget Date: Tue, 12 May 2026 17:07:37 GMT Subject: [PATCH v8 4/5] branch: add branch..pruneMerged opt-out Message-ID: In-Reply-To: From: Harald Nordgren Setting branch..pruneMerged=false exempts that branch from --prune-merged, even with --force. Useful for keeping a topic branch around between rounds. Explicit deletion via 'git branch -d' is unaffected. Signed-off-by: Harald Nordgren --- Documentation/config/branch.adoc | 7 ++++++ Documentation/git-branch.adoc | 3 ++- builtin/branch.c | 23 ++++++++++++++++-- t/t3200-branch.sh | 41 ++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/Documentation/config/branch.adoc b/Documentation/config/branch.adoc index a4db9fa5c8..4662ef35c1 100644 --- a/Documentation/config/branch.adoc +++ b/Documentation/config/branch.adoc @@ -102,3 +102,10 @@ for details). `git branch --edit-description`. Branch description is automatically added to the `format-patch` cover letter or `request-pull` summary. + +`branch..pruneMerged`:: + If set to `false`, branch __ is exempt from + `git branch --prune-merged`. + Useful for topic branches you intend to develop further after + an initial round has been merged upstream. Defaults to true. + Explicit deletion via `git branch -d` is unaffected. diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc index c3f5150f03..080cdc218a 100644 --- a/Documentation/git-branch.adoc +++ b/Documentation/git-branch.adoc @@ -229,7 +229,8 @@ A branch whose upstream no longer resolves locally is left alone integrated). With `--force` (or `-f`), the reachability check is skipped and every branch in the candidate set is deleted. The currently checked-out branch in any worktree is always preserved, -as is the local branch that mirrors __'s default branch. +as is any branch with `branch..pruneMerged` set to `false`, +and the local branch that mirrors __'s default branch. `-v`:: `-vv`:: diff --git a/builtin/branch.c b/builtin/branch.c index 50bf9774a8..2969780210 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -836,12 +836,15 @@ static int prune_merged_branches(int argc, const char **argv, int force, for_each_string_list_item(item, &candidates) { const char *short_name = item->string; struct strbuf full = STRBUF_INIT; + struct strbuf key = STRBUF_INIT; struct branch *branch; const char *upstream; + int opt_out = 0; strbuf_addf(&full, "refs/heads/%s", short_name); if (branch_checked_out(full.buf)) { strbuf_release(&full); + strbuf_release(&key); continue; } strbuf_release(&full); @@ -850,13 +853,29 @@ static int prune_merged_branches(int argc, const char **argv, int force, upstream = branch ? branch_get_upstream(branch, NULL) : NULL; if (!upstream || !refs_ref_exists(get_main_ref_store(the_repository), - upstream)) + upstream)) { + strbuf_release(&key); continue; + } if (string_list_has_string(&protected_default_refs, upstream)) { const char *leaf = strrchr(upstream, '/'); - if (leaf && !strcmp(leaf + 1, short_name)) + if (leaf && !strcmp(leaf + 1, short_name)) { + strbuf_release(&key); continue; + } + } + + strbuf_addf(&key, "branch.%s.prunemerged", short_name); + if (!repo_config_get_bool(the_repository, key.buf, &opt_out) && + !opt_out) { + if (!quiet) + fprintf(stderr, _("Skipping '%s' " + "(branch.%s.pruneMerged is false)\n"), + short_name, short_name); + strbuf_release(&key); + continue; } + strbuf_release(&key); strvec_push(&deletable, short_name); } diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index ca071338d3..8e877862f5 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1867,4 +1867,45 @@ test_expect_success '--prune-merged protects only the default branch by name, no test_must_fail git -C pm-default-alias rev-parse --verify refs/heads/trunk ' +test_expect_success '--prune-merged honours branch..pruneMerged=false' ' + test_when_finished "rm -rf pm-optout" && + git clone pm-upstream pm-optout && + 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 && + git -C pm-optout config branch.one.pruneMerged false && + + git -C pm-optout branch --prune-merged origin 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_expect_success '--prune-merged --force still honours pruneMerged=false' ' + test_when_finished "rm -rf pm-optout-force" && + git clone pm-upstream pm-optout-force && + git -C pm-optout-force checkout -b wip origin/wip && + git -C pm-optout-force branch --set-upstream-to=origin/next wip && + test_commit -C pm-optout-force local-only && + git -C pm-optout-force checkout - && + git -C pm-optout-force config branch.wip.pruneMerged false && + + git -C pm-optout-force branch --force --prune-merged origin && + + git -C pm-optout-force rev-parse --verify refs/heads/wip +' + +test_expect_success 'branch -d still deletes a pruneMerged=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 && + git -C pm-optout-d config branch.one.pruneMerged false && + + git -C pm-optout-d branch -d one && + test_must_fail git -C pm-optout-d rev-parse --verify refs/heads/one +' + test_done -- gitgitgadget