| Message ID | pull.1150.git.1645441854.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | rebase: make reflog messages independent of the backend | expand |
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. Thanks Phillip 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
On Tue, Feb 22, 2022 at 6:04 AM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> wrote: > > This is a series of rebase reflog related patches with the aim of unifying > the reflog messages from the two rebase backends. I took a look but might have been lost or confused in the middle, so I didn't look much at the last patches. I think this has a worthwhile goal though.
On Mon, Feb 21, 2022 at 9:04 PM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> 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.
On Mon, Apr 4, 2022 at 8:34 AM Phillip Wood <phillip.wood123@gmail.com> 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
Hi Elijah On 17/04/2022 03:13, Elijah Newren wrote: > On Mon, Apr 4, 2022 at 8:34 AM Phillip Wood <phillip.wood123@gmail.com> 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. There's no need to apologize, I'm very grateful for you comments. I'll re-roll with that patch split up. Thanks Phillip > >> 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