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

From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: Charvi Mendiratta <charvi077@gmail.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Git List <git@vger.kernel.org>,
	Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v5 0/8][Outreachy] rebase -i: add options to fixup command
Date: Fri, 05 Feb 2021 11:13:13 -0800	[thread overview]
Message-ID: <xmqqmtwi1g6u.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAP8UFD0VpgT=mTydWQRmqo9TFQvdfDiXuA1TcwAqG1BtXXdKxA@mail.gmail.com> (Christian Couder's message of "Fri, 5 Feb 2021 19:25:27 +0100")

Christian Couder <christian.couder@gmail.com> writes:

> On Fri, Feb 5, 2021 at 10:42 AM Charvi Mendiratta <charvi077@gmail.com> wrote:
>
>> On Fri, 5 Feb 2021 at 13:00, Eric Sunshine <sunshine@sunshineco.com> wrote:
>
>> > > * 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.