Re: What's cooking in git.git (Nov 2022, #04; Fri, 18)

[Junio C Hamano <gitster@pobox.com>]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Not only that. `ab/various-leak-fixes` still merges an older iteration:
>
> -- snip --
> $ git range-diff ttaylorr/ab/various-leak-fixes~15^2...ttaylorr/pw/rebase-no-reflog-action
> 1:  d6f756b0d66f ! 1:  d188a60d7228 sequencer: stop exporting GIT_REFLOG_ACTION
>     @@ Commit message
>          pass the reflog action around in a variable and use it to set
>          GIT_REFLOG_ACTION in the child environment when running "git commit".
>
>     +    Within the sequencer GIT_REFLOG_ACTION is no longer set and is only read
>     +    by sequencer_reflog_action(). It is still set by rebase before calling
>     +    the sequencer, that will be addressed in the next commit. cherry-pick
>     +    and revert are unaffected as they do not set GIT_REFLOG_ACTION before
>     +    calling the sequencer.
>     +
>          Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>     +    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>          Signed-off-by: Taylor Blau <me@ttaylorr.com>
>
>       ## sequencer.c ##
> 2:  be0a662f863c ! 2:  0e34efb31d89 rebase: stop exporting GIT_REFLOG_ACTION
>     @@ Commit message
>          reflog_action.
>
>          Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>     +    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>          Signed-off-by: Taylor Blau <me@ttaylorr.com>
>
>       ## builtin/rebase.c ##
> -- snap --
>
> And that superseded iteration of `pw/rebase-no-reflog-action` _did_ hit
> `next`.

Thanks, all.

So in short, we should

 * revert the merge of ab/various-leak-fixes to 'next'

 * rebuild ab/various-leak-fixes using the updated iteration of the
   other topic

 * merge rebuilt ab/various-leak-fixes to 'next'.

in this order.