Re: [PATCH 0/2] tmp-objdir: fix regressions in core.fsyncobjectfiles=batch

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 27, 2021, 21:09 UTC
Message-ID: <xmqqo87auqda.fsf@gitster.g>
In-Reply-To: <nycvar.QRO.7.76.6.2110271439120.56@tvgsbejvaqbjf.bet>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 18 quoted lines

>> Neeraj Singh (2):
>>   fixup! tmp-objdir: new API for creating temporary writable databases
>>   fixup! tmp-objdir: new API for creating temporary writable databases
>
> Thank you for the fast work on the fixes!
>
> I applied both patches to the PR branch and pushed; Let's see how the CI
> over at https://github.com/git-for-windows/git/pull/3492 pans out.
>
> Please note the original patch made it into `next` already (and is hence
> subject to follow-up patches rather than being rewritten).
>
> Therefore, you may need to reword the commit messages so that they stand
> on their own, as follow-up commits.
>
> And alternative would be to ask Junio to kick the topic out of `next` and
> back to `seen`, in which case you will probably be asked to submit a new
> iteration of the original patch.

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).