Elijah Newren <newren@xxxxxxxxx> writes: > On Tue, Dec 28, 2021 at 3:27 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: >> >> * ds/sparse-checkout-malformed-pattern-fix (2021-12-25) 4 commits >> (merged to 'next' on 2021-12-27 at c410caf527) >> + fixup! sparse-checkout: fix OOM error with mixed patterns >> + sparse-checkout: refuse to add to bad patterns >> + sparse-checkout: fix OOM error with mixed patterns >> + sparse-checkout: fix segfault on malformed patterns >> >> Certain sparse-checkout patterns that are valid in non-cone mode >> led to segfault in cone mode, which has been corrected. >> >> Will merge to 'master'. >> source: <pull.1069.v4.git.1639671222.gitgitgadget@xxxxxxxxx> > > Eek, this was merged with the "fixup!" commit to next. I think that > was a mistake...but what's the plan now? Merge to master as-is...or > revert from next, then squash, then re-merge? If the fixup turns out to be unnecessary (which I suspect may become the case), we can just revert it at the tip the topic branch.
