On Mon, Jan 27, 2025 at 10:14 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Christian Couder <christian.couder@xxxxxxxxx> writes: > > - Patches 1/6 and 2/6 are new in this series. They come from the > > patch series Usman Akinyemi is working on > > (https://lore.kernel.org/git/20250124122217.250925-1-usmanakinyemi202@xxxxxxxxx/). > > We need a similar redact_non_printables() function as the one he > > has been working on in his patch series, so it's just simpler to > > reuse his patches related to this function, and to build on top of > > them. > > Two topics in flight, neither of which hit 'next', sharing a handful > of patches is cumbersome to keep track of. Typically our strategy > dealing with such a situation has been for these topics to halt and > have the authors work together to help the common part solidify a > bit better before continuing. Otherwise, every time any one of the > topics that share the same early parts of the series needs to change > them even a bit, it would result in a huge rebase chaos, and worse > yet, even if the two (or more) topics share the need for these two > early parts, they may have different dependency requirements (e.g. > this may be OK with these two early patches directly applied on > 'maint', while the other topic may need to have these two early > patches on 'master'). > > I think [3/6] falls into the same category as [1/6] and [2/6], that > is, to lay foundation of the remainder? Yeah, but patches 1/6, 2/6 and 3/6 are removed in the next version, thanks to a comment by Patrick... > > - In patch 4/6, the commit message has been improved: > > - In patch 4/6, there are also some code changes: > > - In patch 4/6, there is also a small change in the tests. > > All good changes. > > Will queue, but we should find a better way to manage the "an > earlier part is shared across multiple topics" situation. ... so no problem anymore with this earlier part. Thanks!
