On 12/9/2020 8:04 PM, Junio C Hamano wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > >> On Wed, Dec 9, 2020 at 7:33 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: >>> "Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: >>>> Update in V6 >>>> ============ >>>> >>>> * The Windows platform uses the tempfile API a bit better, including using >>>> the frequency in the filename to make the test simpler. >>> >>> Are two fix-up patches from Eric that have been queued near the top >>> of ds/maintenance-part-4 still relevant? >> >> Both of the patches from Sunshine are still relevant atop Stolee's >> latest (v6), and they should apply cleanly (I would think) since v6 >> didn't change anything related to those patches. > > Yup, I tried rebasing these two and they applied cleanly, so I'll > include them in today's pushout (which I haven't finished yet). > > I probably would not notice if the updated 4-patch series already > solved the issue in another way without causing the textual conflict > with your two fix-up patches, though ;-) I noticed a subtle issue with the v6 series, so I _will_ reroll the series squashing in Eric's patches. He will remain a co-author and I'll add the Helped-by: Ævar along with the details for that patch. Thanks, -Stolee
