Re: [PATCH] rebase: add a config option for --no-fork-point

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Jan 21, 2021, 23:25 UTC
Message-ID: <CAMMLpeQ5ga_e5-YeVuArYBrui+ps7HWzNjWNQgeJK3sEjo2zhA@mail.gmail.com>
In-Reply-To: <xmqqo8hiaptn.fsf@gitster.c.googlers.com>

On Thu, Jan 21, 2021 at 3:27 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

>
> By the way, is the feature itself something we can test easily?  I
> think I saw the "we must interact with --root sensibly" test, but
> the actual feature not being tested include
>
>  - rebase.forkpoint set to false and then to true; does it use the
>    fork-point feature (your patch as-is would have failed this test);
>
>  - rebase.forkpoint set to false and command line says --fork-point;
>
>  - rebase.forkpoint set to true and command line says --no-fork-point;
>
> I offhand do not know if it is easy to observe it the fork-point
> feature gets triggered, but it seems that the difference in
> behaviour is big enough for you to care, so I am hoping you may
> think of a way.

This blog post describes the same problem that I had with fork-point: https://commaok.xyz/post/fork-point/

I didn't see any fork-point tests in the current codebase, but I can work on adding some. Do you want them in a separate patch (that would make the most sense to me), or squashed into the rebase.forkPoint patch?

-Alex