On Fri, Apr 15, 2022 at 5:23 PM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > > Hi Chirstian > > Thanks for taking a look at this series > > On 07/04/2022 14:49, Christian Couder wrote: > > On Tue, Feb 22, 2022 at 6:12 AM Phillip Wood via GitGitGadget > > <gitgitgadget@xxxxxxxxx> wrote: > >> > >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > >> > >> The reflog message for a conflict resolution committed by "rebase > >> --continue" looks like > >> > >> rebase (continue): commit subject line > >> > >> Unfortunately the reflog message each subsequent pick look like > >> > >> rebase (continue) (pick): commit subject line > >> > >> Fix this by setting the reflog message for "rebase --continue" in > >> sequencer_continue() so it does not affect subsequent commits. This > >> introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION > >> in pick_commits(). Both of these will be fixed in a future series that > >> stops the sequencer calling setenv(). > > > > Yeah, it looks like we will leak only a small string. > > > >> Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > >> --- > >> builtin/rebase.c | 2 - > >> sequencer.c | 5 ++ > >> t/t3406-rebase-message.sh | 120 +++++++++++++++++++++++++------------- > > > > The changes to the test script look a bit involved and aren't > > explained in the commit message. I wonder if some of those changes > > could have been made in a preparatory commit. > > That's a good point. For some reason when I put the series together I > thought it would be tricky to do that without the fixes in this commit > but that is not actually the case so I'll split the test changes out. That would be very nice; I'd like to see it split out too.
