Re: [PATCH v5 0/8][Outreachy] rebase -i: add options to fixup command

Christian Couder [off-list ref] writes:

On Fri, Feb 5, 2021 at 10:42 AM Charvi Mendiratta [off-list ref] wrote:

quoted

On Fri, 5 Feb 2021 at 13:00, Eric Sunshine [off-list ref] wrote:

quoted

quoted

quoted

* 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.

I agree, these fixes are required. So, I am not sure but now to do these
fixup shall I send another patch cleaning this patch series(v4) and rebase the
patch on the 'next' branch ? Is it the right way ?

Yeah, I think you can send each of the above 3 changes in a different
patch on top of the 'next' branch. That would create a new 3 patch
long series, which you should give a new name and not consider v5 of
the previous patch series.

Correct, except that it shouldn't be on top of the 'next' branch.

Please "git log --first-parent --oneline master..next" to find the
tip of what got merged, and build on top of that instead.  I.e.

    $ git show -s --oneline \
	"origin/next^{/ branch 'cm/rebase-i' into }"
    4f9aa6cec3 Merge branch 'cm/rebase-i' into next
    $ git checkout -b my-follow-up-topic 4f9aa6cec3^2
    ... work work work ...

That is what we mean by "after getting merged to 'next', the topic
gets polished incrementally".

Alternatively, you can have branches from the broken-out repository
handy, e.g.

    $ git remote add brokenout https://github.com/gitster/git

and you'd find the topic as I see it like so:

    $ git fetch brokenout
    $ git log --oneline brokenout/master..brokenout/cm/rebase-i

HTH; thanks.

On Sat, 6 Feb 2021 at 00:43, Junio C Hamano [off-list ref] wrote:
[...]

Correct, except that it shouldn't be on top of the 'next' branch.

Please "git log --first-parent --oneline master..next" to find the
tip of what got merged, and build on top of that instead.  I.e.

    $ git show -s --oneline \
        "origin/next^{/ branch 'cm/rebase-i' into }"
    4f9aa6cec3 Merge branch 'cm/rebase-i' into next
    $ git checkout -b my-follow-up-topic 4f9aa6cec3^2
    ... work work work ...

That is what we mean by "after getting merged to 'next', the topic
gets polished incrementally".

Alternatively, you can have branches from the broken-out repository
handy, e.g.

    $ git remote add brokenout https://github.com/gitster/git

and you'd find the topic as I see it like so:

    $ git fetch brokenout
    $ git log --oneline brokenout/master..brokenout/cm/rebase-i

Got it, thanks all for guiding. I will update soon.

Thanks and Regards,
Charvi