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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 28, 2021, 00:30 UTC
Message-ID: <xmqqcznqt2gu.fsf@gitster.g>
In-Reply-To: <20211027225706.GA3984@neerajsi-x1.localdomain>

Neeraj Singh <nksingh85@gmail.com> writes:

Show 15 quoted lines

> 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?

If we all agree on the above plan, then nothing for you for now, but we'd ask you to send a cleaned-up patch after the upcoming release when the 'next' branch gets rewound and rebuilt, at which time we can get rid of the "oops, we screwed up" fixup patches.

Thanks for finding and sending in the fix.