On Fri, Jan 30, 2026 at 03:41:31PM -0500, Joe Lawrence wrote: > On Fri, Jan 30, 2026 at 12:09:35PM -0800, Josh Poimboeuf wrote: > > On Fri, Jan 30, 2026 at 12:59:49PM -0500, Joe Lawrence wrote: > > > @@ -131,6 +133,7 @@ Advanced Options: > > > 3|diff Diff objects > > > 4|kmod Build patch module > > > -T, --keep-tmp Preserve tmp dir on exit > > > + -z, --fuzz[=NUM] Rebase patches using fuzzy matching > > > [default: 2] > > > > Ideally I think klp-build should accept a patch level fuzz of 2 by > > default. If we just made that the default then maybe we don't need this > > option? > > > > Do you mean to drop the optional level value, or to just perform level-2 > fuzz rebasing as a matter of course (so no -z option altogether)?
Sorry, I was a bit confused by the previous patch. I was thinking "git apply" already has a default fuzz level of 2, and that --recount made it stricter somehow. But now I see that the "git apply" default is *no* fuzz, as opposed to GNU patch which defaults to fuzz 2. For kpatch-build we used GNU patch, should we just change klp-build to use that as well? It worked well for 10+ years and the defaults were fine. We could maybe use patchutils to fix up the line numbers/counts. Then we presumably wouldn't need the --fuzz option as there would be sane defaults already. I think some fuzz is acceptable, especially since patch shows a warning message when it happens. -- Josh
