pr-1150/phillipwood/wip/rebase-reflog-fixes-v3
tagged this
12 Oct 09:35
This series fixes some bugs in the reflog messages when rebasing and changes the reflog messages of "rebase --apply" to match "rebase --merge" with the aim of making the reflog easier to parse. Thanks to everyone who commented on V2, I've added the review club participants that I've got address for to the cc list. I've rebased onto pw/rebase-keep-base-fixes. Change since V2: * Patch 1: Reworded the commit message to address the concerns in [1,2] about the behavior when head_name is NULL. There is also a small change due to being rebased. * Patch 2: Unchanged. There wasn't much love for parameterized tests in review club but we want to ensure both backends produce the same messages I think this is the safest way to achieve that. Using separate tests makes it too easy to introduce subtle differences in the testing of the two backends. * Patch 3: Added a note to the commit message to address the concerns in [1] about not resetting GIT_REFLOG_ACTION when we return early. * Patches 4 & 5: Unchanged. * Patch 6: Reworded the commit message to make a stronger argument for this change. There are concerns about backwards compatibility in [1,3,4] but (i) we have made similar changes in the past without complaints and (ii) we're changing the message to an existing format. There is also a small change due to being rebased. * Patches 7 & 8: Small changes due to rebase. [1] https://docs.google.com/document/d/14L8BAumGTpsXpjDY8VzZ4rRtpAjuGrFSRqn3stCuS_w/edit?pli=1#heading=h.t6g5l2t5ibzw [2] https://lore.kernel.org/git/xmqq35i7r4rj.fsf@gitster.g/ [3] https://lore.kernel.org/git/xmqq4k2nmmeg.fsf@gitster.g/ [4] https://lore.kernel.org/git/220420.865yn4833u.gmgdl@evledraar.gmail.com/ V2 Cover Letter: Thanks to Christian and Elijah for their comments on V1. I've updated commit message for patch 1 to try and be clearer about the removal of a call to strbuf_release() and spilt out the test changes from the old patch 2 into a separate preparatory patch. V1 Cover Letter: 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 (8): rebase --apply: remove duplicated code t3406: rework rebase reflog tests 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 | 146 ++++++++++++------------------ sequencer.c | 5 ++ t/t3406-rebase-message.sh | 185 +++++++++++++++++++++++++++++++------- 3 files changed, 215 insertions(+), 121 deletions(-) base-commit: 0203c679871112c78adc6428a8ed6c04c30ccad9 Submitted-As: https://lore.kernel.org/git/pull.1150.v3.git.1665567312.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1150.git.1645441854.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1150.v2.git.1650448612.gitgitgadget@gmail.com
Assets 2
-
2022-10-12T09:35:12Z -
2022-10-12T09:35:12Z -