Hi Ævar, On Tue, 15 Nov 2022, Ævar Arnfjörð Bjarmason wrote: > In 1f80129d61b (maintenance: add option to register in a specific > config, 2022-11-09) code was added which triggers a > "-Wdeclaration-after-statement" warning, which is on by default with > DEVELOPER=1. > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> > --- > > This landed in the latest "next" push-out, causing e.g this CI > failure: > https://github.com/git/git/actions/runs/3467538041/jobs/5792504315 I looked at the same thing all morning, and found that https://lore.kernel.org/git/20221111231910.26769-1-ronan@xxxxxx/ _probably_ was designed to fix the same issue (and I think you agree that that patch should be used instead of yours because it is more complete in fixing left-over issues). However, try as I might, I did not find out yet why it does not apply cleanly over here (I got side-tracked into range-diff'ing patches downloaded from the archive, which is quite the challenge and not even fun because `range-diff` requires commits, not emails, so I side-tracked myself into teaching `range-diff` to accept mbox arguments). Maybe you can adjust that patch so it applies cleanly? Ciao, Dscho > > builtin/gc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/gc.c b/builtin/gc.c > index 56b107e7f0b..22a990db0be 100644 > --- a/builtin/gc.c > +++ b/builtin/gc.c > @@ -1543,6 +1543,7 @@ static int maintenance_unregister(int argc, const char **argv, const char *prefi > int found = 0; > struct string_list_item *item; > const struct string_list *list; > + struct config_set cs; > > argc = parse_options(argc, argv, prefix, options, > builtin_maintenance_unregister_usage, 0); > @@ -1550,7 +1551,6 @@ static int maintenance_unregister(int argc, const char **argv, const char *prefi > usage_with_options(builtin_maintenance_unregister_usage, > options); > > - struct config_set cs; > if (config_file) { > git_configset_init(&cs); > git_configset_add_file(&cs, config_file); > -- > 2.38.0.1473.g172bcc0511c > > >
