Re: git: 09711ccb09f4 - main - Remove source_rc_confs, inlined from defaults/rc.conf

On 9/15/26 18:21, Devin Teske wrote:
> 
> 
>> On Sep 15, 2026, at 3:16 PM, Jessica Clarke <jrtc27@freebsd.org> wrote:
>>
>> Half-repaired is fine, you can have multiple Fixes: commits. Having
>> those "separate commits on a branch if ordered carefully" be the actual
>> commits landed in main is generally best practice, both within the
>> project and generally within software engineering. So if that’s
>> possible, does that not contradict your statement that splitting would
>> leave such "landmines", without any qualification to make it anything
>> but an absolute statement?
>>
> 
> "Landmines" meant half-repaired tips on main, not every possible
> multi-commit series. I landed one atomic Fixes commit for
> eaeb5f29bc6f. That choice stands.

FWIW, I commonly land separate fixes as multiple commits now in git-world
(as opposed to svn) as it does make it easier if you need to revert one
of them for some reason (as you don't have to revert the entire thing).
Smaller patches, in general, also makes reviewing easier (as Jessica notes).
There is no requirement to rolling up fixes into a single commit vs
splitting them out, especially if they are all pushed as a single batch.

-- 
John Baldwin