From: Alex Henrie <alexhenrie24@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] rebase: add a config option for --no-fork-point
Date: Thu, 21 Jan 2021 16:25:25 -0700 [thread overview]
Message-ID: <CAMMLpeQ5ga_e5-YeVuArYBrui+ps7HWzNjWNQgeJK3sEjo2zhA@mail.gmail.com> (raw)
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:
>
> 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
next prev parent reply other threads:[~2021-01-21 23:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 4:44 [PATCH] rebase: add a config option for --no-fork-point Alex Henrie
2021-01-20 23:00 ` Junio C Hamano
2021-01-20 23:13 ` Alex Henrie
2021-01-21 22:27 ` Junio C Hamano
2021-01-21 23:25 ` Alex Henrie [this message]
2021-01-21 23:45 ` Denton Liu
2021-01-21 23:51 ` Alex Henrie
2021-02-18 23:29 ` Junio C Hamano
2021-02-20 5:10 ` Alex Henrie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMMLpeQ5ga_e5-YeVuArYBrui+ps7HWzNjWNQgeJK3sEjo2zhA@mail.gmail.com \
--to=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).