From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: "Theodore Y. Ts'o" <tytso@mit.edu>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git <git@vger.kernel.org>,
Emily Shaffer <emilyshaffer@google.com>
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Date: Thu, 10 Dec 2020 23:17:24 -0800 [thread overview]
Message-ID: <xmqqim98inml.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: CAMP44s2Po25VyHs-xQG0_oKhAOvPK_PNu5edQkYYsScZeBw1nw@mail.gmail.com
Felipe Contreras <felipe.contreras@gmail.com> writes:
> On Thu, Dec 10, 2020 at 12:28 PM Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> how much damage are we causing to
>> existing users who expect the command to work the way it currently
>> does?
>
> Zero. Because my proposal does *not* make the pull fail, it merely
> prints a warning that it will change in the future.
The approach to hold the "future" patch of and keep giving a
"warning" is still likely to cause damage to people like Ted and
Dscho (both gave examples of workflowsand automation that currently
happily creating merges as the user expects, while the user just
ignores the warning, without being configured at all), when finally
the "future" patch (after fixing the test breakages, of course)
lands. They just ignored the current loud messages---I do not see
any reason to expect the updated "warning" would have any effect on
them and help them to prepare for the future default change.
It is either being dishonest or deliberatly closing eyes to say
"Zero" after hearing what they said, I would have to say.
next prev parent reply other threads:[~2020-12-11 11:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 1:31 What's cooking in git.git (Dec 2020, #01; Tue, 8) Junio C Hamano
2020-12-09 1:41 ` Taylor Blau
2020-12-10 2:02 ` Jonathan Tan
2020-12-09 2:45 ` Elijah Newren
2020-12-09 4:22 ` Junio C Hamano
2020-12-09 23:02 ` Taylor Blau
2020-12-10 0:57 ` Junio C Hamano
2020-12-10 2:57 ` Jonathan Tan
2020-12-09 14:09 ` fc/pull-merge-rebase, was " Johannes Schindelin
2020-12-09 21:28 ` Junio C Hamano
2020-12-10 0:31 ` Felipe Contreras
2020-12-10 4:40 ` Johannes Schindelin
2020-12-10 4:46 ` Johannes Schindelin
2020-12-10 15:11 ` Felipe Contreras
2020-12-10 15:27 ` Theodore Y. Ts'o
2020-12-10 18:28 ` Junio C Hamano
2020-12-11 1:33 ` Felipe Contreras
2020-12-11 7:17 ` Junio C Hamano [this message]
2020-12-11 14:10 ` Felipe Contreras
2020-12-11 22:09 ` Theodore Y. Ts'o
2020-12-12 0:43 ` Felipe Contreras
2020-12-10 0:27 ` Felipe Contreras
2020-12-11 5:59 ` Junio C Hamano
2020-12-09 14:11 ` js/init-defaultbranch-advice, " Johannes Schindelin
2020-12-09 21:57 ` Junio C Hamano
2020-12-10 4:54 ` Johannes Schindelin
2020-12-10 18:33 ` Junio C Hamano
2020-12-11 0:03 ` Felipe Contreras
2020-12-10 3:56 ` bc/rev-parse-path-format, " Johannes Schindelin
2020-12-10 18:34 ` Junio C Hamano
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=xmqqim98inml.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=tytso@mit.edu \
/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).