On Wed, Oct 27, 2021 at 02:09:21PM -0700, Junio C Hamano wrote: > Yeah, none of the above is attractive this late in the cycle X-<. > > It probalby is best to queue the "fixup!" commits as they are on top > of ns/tmp-objdir, merge the result to two topics that depend on > ns/tmp-objdir, and keep them without merging them down, until the > release. When it is time to rewind 'next' after the release, it > would be a good chance to get rid of these "oops, earlier we screwed > up" commits by redoing the tmp-objdir (and rebasing the other two > topics on top). > Hi Junio, Apologies for the breakage! I just want to be 100% clear here: is there any action I should take with the patches, or will you handle the merge/rebase? FYI for anyone trying this on git-for-windows, there's one additional patch at: https://github.com/neerajsi-msft/git/commit/435e1d2e5e8fb422b0f08ff6a01a130584f7e249 That fixes a gfw-specific breakage that affects tmp_objdir_migrate and causes it to infinitely create recursive directories until the disk fills up (surprisingly we don't hit stack overflow first). Thanks, Neeraj
