Re: What's cooking in git.git (Sep 2022, #02; Fri, 9)

From: Jeff King <peff@peff.net>
Date: Sep 11, 2022, 05:09 UTC
Message-ID: <Yx1tnBRXJdkFQYEX@coredump.intra.peff.net>
In-Reply-To: <xmqq5yhwi1vw.fsf@gitster.g>

On Fri, Sep 09, 2022 at 04:06:27PM -0700, Junio C Hamano wrote:

Show 13 quoted lines

> [Cooking]
> 
> * ab/unused-annotation (2022-09-01) 2 commits
>   (merged to 'next' on 2022-09-08 at dfc6123c6b)
>  + git-compat-util.h: use "deprecated" for UNUSED variables
>  + git-compat-util.h: use "UNUSED", not "UNUSED(var)"
>  (this branch uses jk/unused-annotation.)
> 
>  Undoes 'jk/unused-annotation' topic and redoes it to work around
>  Coccinelle rules misfiring false positives in unrelated codepaths.
> 
>  Will merge to 'master'.
>  source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>

I just want to double-check that the plan is to merge this to master as noted above. I had thought you would revert jk/unused-annotation and that I'd just re-roll it. I'm perfectly happy with either, but just didn't want to add more confusion by posting that re-roll. ;)

-Peff