From: Philip Oakley Date: Thu, 25 Nov 2021 13:11:52 GMT Subject: Re: What's cooking in git.git (Nov 2021, #06; Wed, 24) Message-ID: <3e7af5d3-58fd-3a92-371f-3fa26cfe05a0@iee.email> In-Reply-To: On 25/11/2021 05:56, Junio C Hamano wrote: > * rs/mergesort (2021-11-18) 1 commit > - mergesort: avoid left shift overflow > > Bitop fix for 32-bit boxes. From my Win64 perspective, this also covers LLP64 boxes. Maybe   s/32-bit boxes/32-bit and LLP64 boxes/.   I'm still resolving an unexpected rebase problem with my short series that fixes the other Visual Studio C4334 "was 64-bit shift intended" size mismatch warnings. My rebase problem appears to be because sha1-file was renamed object-file.c, where one of my fixes is applied, and the rebase onto this rs/mergesort series decided that my one line change should include 3 extra lines (see https://github.com/PhilipOakley/git/tree/oneU_t-v2; 03203b1679). I'll probably just rebase my patches onto the latest master. Two of the patches could be retrospectively applied to maint, but the object-file.c patch is probably best on master. Philip