Re: [PATCH 0/5] rebase --keep-base: imply --reapply-cherry-picks and --no-fork-point

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 16, 2022, 09:23 UTC
Message-ID: <5o8oon84-sqop-o269-30s4-71p72or31r20@tzk.qr>
In-Reply-To: <pull.1323.git.1660576283.gitgitgadget@gmail.com>

Hi Phillip,

On Mon, 15 Aug 2022, Phillip Wood via GitGitGadget wrote:

> A while a go Philippe reported [1] that he was surprised 'git rebase
> --keep-base' removed commits that had been cherry-picked upstream even
> though to branch was not being rebased.

This has bitten me, too (I did just not get around to reply to Philippe's mail).

Show 5 quoted lines

> I think it is also surprising if '--keep-base' changes the base of the
> branch without '--fork-point' being explicitly given on the command
> line. This series therefore changes the default behavior of
> '--keep-base' to imply '--reapply-cherry-picks' and '--no-fork-point' so
> that the base of the branch is unchanged and no commits are removed.

In my mind, `--keep-base` should always have adjusted the `<upstream>` to point to the base commit, which is what patch 4/5 does.

So I am very much in favor of this patch series.

Junio seems to be on top of the code review, so I'll avoid stepping on his toes by adding mine ;-)

Ciao, Dscho