From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Stefan Haller <lists@haller-berlin.de>
Subject: Re: Thoughts on the "branch <b> is not fully merged" error of "git-branch -d"
Date: Sat, 07 Sep 2024 10:08:20 -0700 [thread overview]
Message-ID: <xmqqtterwfwb.fsf@gitster.g> (raw)
In-Reply-To: <xmqqy143wgao.fsf@gitster.g> (Junio C. Hamano's message of "Sat, 07 Sep 2024 09:59:43 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Having said all that, I do not mind if somebody wanted to further
> extend builtin/branch.c:branch_merged() so that users can explicitly
> configure a set of reference branches. "The 'master' and 'maint'
> are the integration branches that are used in this repository.
> Unless the history of a local branch is fully merged to one of
> these, 'git branch -d' of such a local branch will stop." may be a
> reasonable thing to do.
If anybody is interested in doing this, I think the design should
also make sure these branches that are designated as reference
branches are protected from 'git branch -d'.
next prev parent reply other threads:[~2024-09-07 17:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-07 16:28 Thoughts on the "branch <b> is not fully merged" error of "git-branch -d" Stefan Haller
2024-09-07 16:59 ` Junio C Hamano
2024-09-07 17:08 ` Junio C Hamano [this message]
2024-09-07 18:51 ` Stefan Haller
2024-09-07 20:00 ` Junio C Hamano
2024-09-08 5:33 ` Stefan Haller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtterwfwb.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lists@haller-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).