From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Taylor Blau <me@ttaylorr.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Nov 2022, #04; Fri, 18)
Date: Sun, 20 Nov 2022 22:24:02 +0100 (CET) [thread overview]
Message-ID: <on4s271q-21s5-onsp-ss70-863nr403760p@tzk.qr> (raw)
In-Reply-To: <35abf6a0-982c-42d3-78c8-0298b53e6faa@dunelm.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3692 bytes --]
Hi Phillip & Taylor,
On Sun, 20 Nov 2022, Phillip Wood wrote:
> 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
>
> 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>
>
>
next prev parent reply other threads:[~2022-11-20 21:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 2:22 What's cooking in git.git (Nov 2022, #04; Fri, 18) Taylor Blau
2022-11-20 11:24 ` SZEDER Gábor
2022-11-20 17:42 ` Looking for a review (pretty-formats, hard truncation), was What's cooking in git.git (Nov 2022, #04; Fri, 18)) Philip Oakley
2022-11-21 0:37 ` Junio C Hamano
2022-11-21 18:10 ` Philip Oakley
2022-11-20 19:46 ` What's cooking in git.git (Nov 2022, #04; Fri, 18) Phillip Wood
2022-11-20 21:24 ` Johannes Schindelin [this message]
2022-11-21 0:47 ` Junio C Hamano
2022-11-21 1:00 ` Taylor Blau
2022-11-22 14:58 ` Phillip Wood
2022-11-20 21:45 ` Junio C Hamano
2022-11-20 23:51 ` Taylor Blau
2022-11-20 23:24 ` Junio C Hamano
2022-11-20 23:52 ` Taylor Blau
2022-11-21 3:36 ` Junio C Hamano
2022-11-22 22:56 ` Taylor Blau
2022-11-21 0:10 ` Junio C Hamano
2022-11-21 0:16 ` Taylor Blau
2022-11-23 0:03 ` Junio C Hamano
2022-11-21 22:22 ` ab/submodule-no-abspath (was Re: What's cooking in git.git (Nov 2022, #04; Fri, 18)) Glen Choo
2022-11-22 22:45 ` [PATCH] submodule absorbgitdirs: use relative <from> and <to> paths Ævar Arnfjörð Bjarmason
2022-11-23 0:43 ` Glen Choo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=on4s271q-21s5-onsp-ss70-863nr403760p@tzk.qr \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).