From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
Git <git@vger.kernel.org>, "Vít Ondruch" <vondruch@redhat.com>,
"Theodore Y . Ts'o" <tytso@mit.edu>, "Jeff King" <peff@peff.net>,
"Andreas Krey" <a.krey@gmx.de>,
"John Keeping" <john@keeping.me.uk>,
"Richard Hansen" <rhansen@rhansen.org>,
"Philip Oakley" <philipoakley@iee.email>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
"W. Trevor King" <wking@tremily.us>
Subject: Re: [PATCH v7 1/1] pull: add ff-only option
Date: Mon, 23 Nov 2020 15:32:36 -0800 [thread overview]
Message-ID: <xmqqim9vlkdn.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAMMLpeR8_fshsaqSF6idOY-KyFw2+AK_5683a-7wDXhsO=iFVQ@mail.gmail.com> (Alex Henrie's message of "Mon, 23 Nov 2020 16:22:28 -0700")
Alex Henrie <alexhenrie24@gmail.com> writes:
> On Mon, Nov 23, 2020 at 3:46 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>>
>> This patch leaves everything in place to enable this new mode, but it
>> only gets enabled if the user specifically configures it;
>>
>> pull.rebase = ff-only.
>
> Why not use the existing pull.ff=only option instead of adding a new one?
If you have pull.rebase=false, "git -c pull.ff=only pull" would fail
as desired upon a non-fast-forward. But if you have
pull.rebase=true, does it fail the same way (not a rhetorical
question; I didn't try)? If so, I agree we do not need a new one.
Otherwise, I am on two minds.
Having just a single variable would be easier to manage, so
pull.rebase=ff-only that is equivalent to pull.ff=only might be
claimed to be UI improvement.
On the other hand, it looks quite funny for that single variable
that controls the way how pull works, whether rebase or merge is
used, is pull.REBASE.
next prev parent reply other threads:[~2020-11-23 23:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 22:46 [PATCH v7 0/1] Reject non-ff pulls by default Felipe Contreras
2020-11-23 22:46 ` [PATCH v7 1/1] pull: add ff-only option Felipe Contreras
2020-11-23 23:02 ` Felipe Contreras
2020-11-23 23:22 ` Alex Henrie
2020-11-23 23:32 ` Junio C Hamano [this message]
2020-11-23 23:51 ` Felipe Contreras
2020-11-24 1:45 ` Jeff King
2020-11-24 0:08 ` Felipe Contreras
2020-11-24 0:32 ` Raymond E. Pasco
2020-11-24 1:51 ` Alex Henrie
2020-11-24 3:45 ` Felipe Contreras
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=xmqqim9vlkdn.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=rhansen@rhansen.org \
--cc=sandals@crustytoothpaste.net \
--cc=tytso@mit.edu \
--cc=vondruch@redhat.com \
--cc=wking@tremily.us \
/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).