On Mon, 20 May 2024, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > Please do not base a new topic on 'next', as I will NOT be applying > > it on top of 'next'. > > ... > > Unless the conflicts are severe and is impractical, in which case > > see Documentation/SubmittingPatches and look for "Under truly > > exceptional circumstances". But the conflict in Makefile about > > UNIT_TEST_PROGRAMS in this case hadly qualifies as one. Will make sure for the next time. > > Anyway, thanks for a patch. > > I've backported the patch to apply to "master" and queued it on its > own topic, so that it no longer has to wait for all other topic in > 'next'. The Makefile looks like the attached, which is just with > trivial difference in the context. We only need to remove > strcmp-offset from the TEST_BUILTIN_OBJS and instead add a > corresponding one to UNIT_TEST_PROGRAMS, and that does not change no > matter what other test-*.o are added to the former or t-* are added > to the latter. > > We may want to sort the UNIT_TEST_PROGRAMS list alphabetically at > some point, by the way. That was aleady done in 'la/hide-trailer-info' (next). Thanks.
