From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Jul 2026 15:52:01 GMT
Subject: Re: What's cooking in git.git (Jul 2026, #12)
Message-ID: <xmqqa4r9aj4u.fsf@gitster.g>
In-Reply-To: <80bd230e-7b8c-41d3-af1c-fa84b0c7b1c4@gmail.com>

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.