On Mon, Apr 4, 2022 at 8:34 AM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > > If anyone has time to review these patches I'd be very grateful. I've > cc'd this message to some list regulars who have reviewed rebase patches > before but if anyone else fancies taking a look at them that would be great. I apologize for the delay here...especially when it came after you had already waited a month and a half. (This is the first git thing I've done in over a month, sadly.) Anyway, I just read through the series and left some comments; mostly looks good but I second the request to split up one of the patches. > On 21/02/2022 11:10, Phillip Wood via GitGitGadget wrote: > > This is a series of rebase reflog related patches with the aim of unifying > > the reflog messages from the two rebase backends. > > > > * improve rebase reflog test coverage > > * rebase --merge: fix reflog messages for --continue and --skip > > * rebase --apply: respect GIT_REFLOG_ACTION > > * rebase --abort: improve reflog message > > * unify reflog messages between the two rebase backends > > > > This series is based on pw/use-inprocess-checkout-in-rebase > > > > Phillip Wood (7): > > rebase --apply: remove duplicated code > > rebase --merge: fix reflog when continuing > > rebase --merge: fix reflog message after skipping > > rebase --apply: respect GIT_REFLOG_ACTION > > rebase --apply: make reflog messages match rebase --merge > > rebase --abort: improve reflog message > > rebase: cleanup action handling > > > > builtin/rebase.c | 144 ++++++++++++----------------- > > sequencer.c | 5 ++ > > t/t3406-rebase-message.sh | 185 +++++++++++++++++++++++++++++++------- > > 3 files changed, 214 insertions(+), 120 deletions(-) > > > > > > base-commit: 38c541ce94048cf72aa4f465be9314423a57f445 > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1150%2Fphillipwood%2Fwip%2Frebase-reflog-fixes-v1 > > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1150/phillipwood/wip/rebase-reflog-fixes-v1 > > Pull-Request: https://github.com/gitgitgadget/git/pull/1150