On Mon, Feb 21, 2022 at 9:04 PM Phillip Wood via GitGitGadget <gitgitgadget@xxxxxxxxx> 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 I read through the seven patches, then went back and commented on all of them. Hard to find problems really, looks nicely written. I would second Christian's request to have the second patch split with a preparatory testcase cleanup, which it appears you already plan to do. Other than patch, the series looks good to me.
