Re: [PATCH 5/5] rebase --keep-base: imply --no-fork-point

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 15, 2022, 21:07 UTC
Message-ID: <xmqqczd1z05h.fsf@gitster.g>
In-Reply-To: <68bcd10949ec7767d1e0ee8e2f0730ca36bad1c5.1660576283.git.gitgitgadget@gmail.com>

"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 5 quoted lines

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> Given the name of the option it is confusing if --keep-base actually
> changes the base of the branch without --fork-point being explicitly
> given on the command line.

Does it merely "imply"? As keep-base requests exactly the same base commit reused from the current history, doesn't fork-point a competing and conflicting request, i.e. "please compute an appropriate fork-point by looking at merge base with possibly rewound tips of upstream branch"?

> +		/*
> +		 * --keep-base ignores config.forkPoint as it is confusing if
> +		 * the branch base changes when using this option.
> +		 */

The comment singles out config.forkPoint (Isn't that "rebase.forkPoint"???) as "confusing". Do we ignore rebase.forkPoint when --keep-base is given? Do we honor --fork-point from the command line when --keep-base is given?

> +		if (options.fork_point < 0)
> +			options.fork_point = 0;