From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.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 14:27:16 -0800 [thread overview]
Message-ID: <xmqqo8hiaptn.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAMMLpeQM7JCP0=TMqf0DxDCVJvkCGDEPSKN6vYTU_xc7+QaA1Q@mail.gmail.com> (Alex Henrie's message of "Wed, 20 Jan 2021 16:13:35 -0700")
Alex Henrie <alexhenrie24@gmail.com> writes:
>> > - if (options.root && fork_point > 0)
>> > + if (options.root && options.fork_point > 0)
>> > die(_("cannot combine '--root' with '--fork-point'"));
>>
>> Is that because of this code?
>
> Yes. I was trying to avoid annoying the user with errors when
> rebase.forkPoint is set to "true" and --root is given on the command
> line.
>
>> If so, perhaps the configuration parser should set the .fork_point
>> to (-1), so that "[rebase] forkpoint = false" that appears in your
>> ~/.gitconfig file can be countermanded with "[rebase] forkpoint"
>> that is placed in .git/config for one particular project that you do
>> not mind using the feature?
>
> That's a great point. I will make that change and resubmit. Thanks!
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.
Thanks.
next prev parent reply other threads:[~2021-01-21 22:30 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 [this message]
2021-01-21 23:25 ` Alex Henrie
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo8hiaptn.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).