From: Phillip Wood Date: Fri, 05 Jun 2026 13:49:21 GMT Subject: Re: [PATCH v12 2/6] branch: let delete_branches warn instead of error on bulk refusal Message-ID: <71675174-c477-420d-a656-d72dc7037d73@gmail.com> In-Reply-To: <6c95e4e77cf555194b83eab92c7564e6b639f500.1780477479.git.gitgitgadget@gmail.com> Hi Harald On 03/06/2026 10:04, Harald Nordgren via GitGitGadget wrote: > From: Harald Nordgren > > Add a warn_only flag to delete_branches() and check_branch_commit() > so a bulk caller can report not-fully-merged branches as one-line > warnings and continue, instead of erroring with the four-line "use > 'git branch -D'" advice that the standalone "git branch -d" path > emits. Default callers pass 0 and are unaffected. > > Signed-off-by: Harald Nordgren > --- > builtin/branch.c | 26 +++++++++++++++++--------- > 1 file changed, 17 insertions(+), 9 deletions(-) > > diff --git a/builtin/branch.c b/builtin/branch.c > index 12711b29cf..93d8eae891 100644 > --- a/builtin/branch.c > +++ b/builtin/branch.c > @@ -192,7 +192,7 @@ static int branch_merged(int kind, const char *name, > > static int check_branch_commit(const char *branchname, const char *refname, > const struct object_id *oid, struct commit *head_rev, > - int kinds, int force) > + int kinds, int force, int warn_only) We've already got two boolean parameters, lets replace those with an "unsigned int flags" parameter rather than adding a third. That way we can avoid having to comment each argument as you do in a later patch. Thanks Phillip > { > struct commit *rev = lookup_commit_reference(the_repository, oid); > if (!force && !rev) { > @@ -200,10 +200,16 @@ static int check_branch_commit(const char *branchname, const char *refname, > return -1; > } > if (!force && !branch_merged(kinds, branchname, rev, head_rev)) { > - error(_("the branch '%s' is not fully merged"), branchname); > - advise_if_enabled(ADVICE_FORCE_DELETE_BRANCH, > - _("If you are sure you want to delete it, " > - "run 'git branch -D %s'"), branchname); > + if (warn_only) { > + warning(_("the branch '%s' is not fully merged"), > + branchname); > + } else { > + error(_("the branch '%s' is not fully merged"), > + branchname); > + advise_if_enabled(ADVICE_FORCE_DELETE_BRANCH, > + _("If you are sure you want to delete it, " > + "run 'git branch -D %s'"), branchname); > + } > return -1; > } > return 0; > @@ -219,7 +225,7 @@ static void delete_branch_config(const char *branchname) > } > > static int delete_branches(int argc, const char **argv, int force, int kinds, > - int quiet) > + int quiet, int warn_only) > { > struct commit *head_rev = NULL; > struct object_id oid; > @@ -309,8 +315,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, > > if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) && > check_branch_commit(bname.buf, name, &oid, head_rev, kinds, > - force)) { > - ret = 1; > + force, warn_only)) { > + if (!warn_only) > + ret = 1; > goto next; > } > > @@ -995,7 +1002,8 @@ int cmd_branch(int argc, > if (delete) { > if (!argc) > die(_("branch name required")); > - ret = delete_branches(argc, argv, delete > 1, filter.kind, quiet); > + ret = delete_branches(argc, argv, delete > 1, filter.kind, > + quiet, 0); > goto out; > } else if (show_current) { > print_current_branch_name();