js/rebase-cleanup, was Re: What's cooking in git.git (May 2019, #03; Sun, 19)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 21, 2019, 18:32 UTC
Message-ID: <nycvar.QRO.7.76.6.1905212028240.46@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqv9y6zufi.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Sun, 19 May 2019, Junio C Hamano wrote:

> The first release candidate Git 2.22-rc1 has been tagged.  There
> still are a few topics from 'next' that need to go to 'master'
> before the final, but otherwise this should be pretty close to the
> final version.  Knock knock...

Fingers crossed!

> I'll be offline for a week or so and will tag -rc2 early next week
> when I get back to the US.

Enjoy your time off.

Show 12 quoted lines

> * js/rebase-cleanup (2019-05-15) 5 commits
>   (merged to 'next' on 2019-05-16 at ccfed8f263)
>  + rebase: fold git-rebase--common into the -p backend
>  + sequencer: the `am` and `rebase--interactive` scripts are gone
>  + .gitignore: there is no longer a built-in `git-rebase--interactive`
>  + t3400: stop referring to the scripted rebase
>  + Drop unused git-rebase--am.sh
>
>  Update supporting parts of "git rebase" to remove code that should
>  no longer be used.
>
>  Will cook in 'next'.

I guess you're saying that this is *not* one of those branches you want to still merge into `master` before v2.22.0... Is this reading correct?

I ask because I have one more patch in the queue that cleans up the NEEDSWORK in git.c that we can now address, and I kept it out of the patch series in order to make it easier to merge down before v2.22 final...

Ciao, Dscho