From: Christian Couder Date: Thu, 07 Apr 2022 13:49:14 GMT Subject: Re: [PATCH 2/7] rebase --merge: fix reflog when continuing Message-ID: In-Reply-To: <493254ffbb8b11f325f5995790341d70198b5c97.1645441854.git.gitgitgadget@gmail.com> On Tue, Feb 22, 2022 at 6:12 AM Phillip Wood via GitGitGadget wrote: > > From: Phillip Wood > > 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 > --- > 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. > 3 files changed, 86 insertions(+), 41 deletions(-)