On Thu, Feb 4, 2021 at 2:05 PM Charvi Mendiratta <charvi077@xxxxxxxxx> wrote: > Changes from v4 : > (Thanks to Eric Sunshine, Christian Couder and Phillip Wood for suggestions > and reviews) Thanks for working on this and re-rolling. Unfortunately, it seems that v4 already landed in Junio's `next` branch which means that he won't be replacing v4 wholesale as would have been the case if it was still in the `seen` branch. Once patches are in `next`, improvements are made by building changes atop them (incrementally) rather than replacing them. Whether or not it makes sense for you to spend time re-doing these patches as incremental changes is not clear. In fact... > The major change in this version is to remove the working of `fixup -C` > with amend! commit and will include in the another patch series, in order > to avoid the confusion. So there are following changes : > * removed the patch (rebase -i : teach --autosquash to work with amend!) > * updated the test script (t3437-*.sh), changed the test setup and removed > two tests. > > Earlier every test includes the commit message having subject starting > with amend! So, now it includes a setup of different branch for testing > fixup with options and also updated all the tests. > Removed the test - "skip fixup -C removes amend! from message" and also > "sequence of fixup, fixup -C & squash --signoff works" as I think it would > be better to test this also in the branch with amend! commit with different > author. (Will add these tests with amend! commit implementation) Despite these being nice cleanups to the standalone series, I'm not sure it's worth spending your time creating new patches to undo these from `next`. Removing them only to add them back later is not necessarily going to help "unconfuse" someone reading the commits in the permanent project history. > * changed the flag type from enum todo_item_flags to unsigned > * Replaced fixup_-* with fixup-* in lib-rebase.sh > * fixup a small nit in Documentation These changes are still worthwhile and can easily be done incrementally atop what is already in next, I would think. Anyhow, use your best judgment to decide how much work to devote to this.
