Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

From: Elijah Newren <newren@gmail.com>
Date: Dec 11, 2021, 10:49 UTC
Message-ID: <CABPp-BEpcmxyRVzC4afRTCdV1W=RQxfzUPESbR_pFGmvTXqTtg@mail.gmail.com>
In-Reply-To: <xmqqilvvluoa.fsf@gitster.g>

Hi,

On Fri, Dec 10, 2021 at 10:31 PM Junio C Hamano <gitster@pobox.com> wrote:

> * en/sparse-checkout-set (2021-12-08) 10 commits

...

>  Need to check the reroll.
>  cf. <pull.1151.v3.git.git.1639108573.gitgitgadget@gmail.com>
>  source: <pull.1151.v2.git.git.1638908410.gitgitgadget@gmail.com>

I'm confused by the status here; en/sparse-checkout-set already represents v3, not v2, so you've already picked up the reroll. (v3 is the one containing both Stolee & Victoria's Reviewed-by.) I think that also means your cf. should be labeled as the source, yes?

> * es/test-chain-lint (2021-12-09) 19 commits

...

>
>  Broken &&-chains in the test scripts have been corrected.
>
>  Will merge to 'next'?

Eric sent a reroll of just patch 2 with some working clarifications. It's a small thing, but I think it'd be great if that re-rolled patch could be picked up and inserted into the series. Other than that, yeah the series is good to merge down. (Peff and Fabian seemed to think so too.)

> * ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits

...

>  Ejected from 'seen', as it seems to fail its self-test.
>  source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>

I _think_ Stolee addressed this in his v3 cover letter with his comment that he also needed to merge with master[1]. However, there are two more things pointed out by Ævar that need fixing[2]; maybe by the time those two items are fixed, ld/sparse-diff-blame will merge to master and he can rebase on master?

[1] https://lore.kernel.org/git/pull.1080.v3.git.1639149192.gitgitgadget@gmail.com/ [2] https://lore.kernel.org/git/CABPp-BEs5gnX+HfPNMRBqtMdhVfkk5oKDT8sN4fJiPG87JDjcw@mail.gmail.com/

> * pw/diff-color-moved-fix (2021-12-09) 15 commits

...

>  Will merge to 'next'?
>  source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>

Dscho seemed to suggest that course of action[2]. (I also looked at the series, though much more lightly -- I couldn't spot any problems.)

[2] https://lore.kernel.org/git/nycvar.QRO.7.76.6.2112081329030.90@tvgsbejvaqbjf.bet/.