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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 20, 2022, 21:24 UTC
Message-ID: <on4s271q-21s5-onsp-ss70-863nr403760p@tzk.qr>
In-Reply-To: <35abf6a0-982c-42d3-78c8-0298b53e6faa@dunelm.org.uk>

Hi Phillip & Taylor,

On Sun, 20 Nov 2022, Phillip Wood wrote:

Show 32 quoted lines

> Hi Taylor
>
> On 19/11/2022 02:22, Taylor Blau wrote:
> > * ab/various-leak-fixes (2022-11-08) 18 commits
> >   (merged to 'next' on 2022-11-18 at 8828bb7161)
> >   + built-ins: use free() not UNLEAK() if trivial, rm dead code
> >   + revert: fix parse_options_concat() leak
> >   + cherry-pick: free "struct replay_opts" members
> >   + rebase: don't leak on "--abort"
> >   + connected.c: free the "struct packed_git"
> >   + sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
> >   + ls-files: fix a --with-tree memory leak
> >   + revision API: call graph_clear() in release_revisions()
> >   + unpack-file: fix ancient leak in create_temp_file()
> >   + built-ins & libs & helpers: add/move destructors, fix leaks
> >   + dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
> >   + read-cache.c: clear and free "sparse_checkout_patterns"
> >   + commit: discard partial cache before (re-)reading it
> >   + {reset,merge}: call discard_index() before returning
> >   + tests: mark tests as passing with SANITIZE=leak
> >   + Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
> >   + rebase: stop exporting GIT_REFLOG_ACTION
> >   + sequencer: stop exporting GIT_REFLOG_ACTION
> >   (this branch is used by ab/merge-index-prep.)
> >
> >   Various leak fixes.
> >
> >   Will merge to 'master'.
> >   source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
>
> Below pw/rabse-no-reflog-action is marked for cooking in next but it will be
> merged to master if you merge this series to master.

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`.

Ciao, Dscho

Show 19 quoted lines

>
> Best Wishes
>
> Phillip
>
> > * pw/rebase-no-reflog-action (2022-11-09) 2 commits
> >   (merged to 'next' on 2022-11-14 at 790dadc8d3)
> >   + rebase: stop exporting GIT_REFLOG_ACTION
> >   + sequencer: stop exporting GIT_REFLOG_ACTION
> >   (this branch is used by ab/merge-index-prep.)
> >
> >   Avoid setting GIT_REFLOG_ACTION to improve readability of the
> >   sequencer internals.
> >
> >   Will cook in 'next'.
> >   source:
> >   <31df037eafede799c2ef27df66c6da309b719b1b.1668003719.git.gitgitgadget@gmail.com>
>
>