From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2026, #12)
Date: Wed, 29 Jul 2026 08:52:01 -0700 [thread overview]
Message-ID: <xmqqa4r9aj4u.fsf@gitster.g> (raw)
In-Reply-To: <80bd230e-7b8c-41d3-af1c-fa84b0c7b1c4@gmail.com> (Phillip Wood's message of "Wed, 29 Jul 2026 16:14:46 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> On 27/07/2026 04:09, Junio C Hamano wrote:
>>
>> * hn/branch-delete-merged (2026-07-25) 7 commits
>> - 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
>>
>> 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.
>>
>> Will merge to 'next'?
>> cf. <xmqqy0ez14s9.fsf@gitster.g>
>> source: <pull.2285.v23.git.git.1784979136.gitgitgadget@gmail.com>
>
> I've just left some comments on this. It is almost there, but the way it
> checks if pushing a branch updates its upstream looks dodgy to me. The
> behavior wrt branches that are merged but are upstreams of other
> branches has changed so that the entire hierarchy is now preseved. I
> preferred it when we only kept the branch that was the upstream of the
> unmerged branch and deleted everything underneath but I'm happy enough
> if others prefer this new behavior.
I don't particularly favor the behavior in the latest round myself,
but I doubt I am the primary target audience, so I'll let the list
figure out how much we collectively care ;-).
Thanks.
prev parent reply other threads:[~2026-07-29 16:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-27 3:09 What's cooking in git.git (Jul 2026, #12) Junio C Hamano
2026-07-29 13:24 ` Phillip Wood
2026-07-29 14:18 ` Junio C Hamano
2026-07-29 15:20 ` Phillip Wood
2026-07-29 17:48 ` Junio C Hamano
2026-08-05 13:10 ` Phillip Wood
2026-08-05 17:03 ` Junio C Hamano
2026-07-31 6:20 ` Matt Hunter
2026-07-31 15:36 ` Junio C Hamano
2026-07-30 6:11 ` Harald Nordgren
2026-07-31 7:02 ` Matt Hunter
2026-08-03 9:05 ` Phillip Wood
2026-08-03 16:02 ` Junio C Hamano
2026-08-04 13:19 ` Phillip Wood
2026-08-03 9:11 ` Phillip Wood
2026-07-29 15:14 ` Phillip Wood
2026-07-29 15:52 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa4r9aj4u.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://public-inbox.org/mirrors/git.git/
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 read-only IMAP folder(s) and NNTP newsgroup(s).