ns/tmp-objdir and ns/remerge-diff

From: Elijah Newren <newren@gmail.com>
Date: Nov 30, 2021, 23:07 UTC
Message-ID: <CABPp-BHq4DnkCZZ+HcnGiZYKHpWJgzMBjMDuWbbTFYPesm2sXA@mail.gmail.com>
In-Reply-To: <xmqqzgpm2xrd.fsf@gitster.g>

On Tue, Nov 30, 2021 at 6:49 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 7 quoted lines

>
> The exception is 'ns/tmp-objdir' and a few topics that depend on it,
> which are kicked out of 'next' to give the base topic a chance to
> lose the two "fixup!" band-aid.  Careful re-reading of the topic by
> somebody with a fresh set of eyes (meaning, everybody, as this has
> been dormant for almost a month) is very much appreciated to move
> things forward.

ns/tmp-objdir had a re-roll that has not been picked up, at [1] -- perhaps because it's an combination of ns/tmp-objdir and ns/batched-fsync (it'd be nicer to have those two split). I gave the ns/tmp-objdir part another read over and was only able to spot two small things. I think you should mark it as expecting a reroll based on [2] ("Good catch. I'll fix this.") and [3] ("I'll take this suggestion."), but I think it could be merged to next quickly after that.

[1] https://lore.kernel.org/git/pull.1076.v9.git.git.1637020263.gitgitgadget@gmail.com/ [2] https://lore.kernel.org/git/CANQDOddCC7+gGUy1VBxxwvN7ieP+N8mQhbxK2xx6ySqZc6U7-g@mail.gmail.com/ [3] https://lore.kernel.org/git/CANQDOdd7EHUqD_JBdO9ArpvOQYUnU9GSL6EVR7W7XXgNASZyhQ@mail.gmail.com/

>  Also ns/remerge-diff that is Neeraj's rebase of the
> remerge-diff topic needs Elijah's Ack at least.

Mark it as expecting a re-roll; I've been waiting for ns/tmp-objdir to settle so I can rebase on it.