Re: git: a8b4678fc925 - main - emulators/virtualbox-ose-70: Fix 15-CURRENT kmod build
- In reply to: Gleb Popov : "Re: git: a8b4678fc925 - main - emulators/virtualbox-ose-70: Fix 15-CURRENT kmod build"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Apr 2025 09:08:32 UTC
On Tue, Apr 29, 2025 at 07:46:16AM +0300, Gleb Popov wrote: > On Tue, Apr 29, 2025 at 7:43 AM Alexey Dokuchaev <danfe@freebsd.org> wrote: > > > > Seeing those context lines gone should've ring a bell that you're preparing > > your patches in a different and perhaps unconventional way. We typically > > regenerate patches with "make makepatch" which takes are of proper headers, > > timestamps, and context quoting. Try it next time, it is awesome! :-) > > make makepatch also regenerates irrelevant hunks if offsets get changed. > > If one wants to commit only the relevant changes, the way to go is > "git restore -p" to first drop irrelevant ones. Offset being changed is absolutely part of a patch and must be committed, when the offset are wrong, patch stops using an algorithm and enters heuristics territory, which may work (what patch calls fuzz), but can also explode mid flight. You always have to commit the complete new patch. -- Mathieu Arnold