From: Alex Henrie <alexhenrie24@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git mailing list <git@vger.kernel.org>,
Robert Dailey <rcdailey.lists@gmail.com>,
Elijah Newren <newren@gmail.com>,
rsbecker@nexbridge.com, Konstantin Tokarev <annulen@yandex.ru>
Subject: Re: [PATCH v2] pull: warn if the user didn't say whether to rebase or to merge
Date: Sat, 29 Feb 2020 14:21:18 -0700 [thread overview]
Message-ID: <CAMMLpeSSET8F+BTooDhBTBGkh2JjvLWOPwA-ibspoDO0NqGy7A@mail.gmail.com> (raw)
In-Reply-To: <xmqqzhd1balh.fsf@gitster-ct.c.googlers.com>
On Sat, Feb 29, 2020 at 9:51 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Alex Henrie <alexhenrie24@gmail.com> writes:
>
> > + warning(_("Pulling without specifying whether to rebase or to merge is discouraged\n"
> > + "and will be disallowed in a future Git release.\n"
>
> Sorry for not catching this in the earlier round, but I do not think
> anybody argued, let alone the community came to a concensus on
> doing, such a strong move. Am I mistaken?
>
> I certainly did not intend to, at least when I commented on the
> earlier round and proposed an updated log message, I wasn't even
> aware of the possibility that we may want to turn this into die()
> after a transition period.
>
> Not that I'd object strongly to the idea, but it was somewhat
> unexpected.
>
> If we are proposing to make it a long-term plan, that should
> certainly be written down in the proposed log message.
I really don't think it's a good idea to start making a merge commit
without confirming that that's what the user wants. Elijah and Robert
seemed to agree. However, we can start by just putting in a friendly
educational message and then continue the discussion about whether or
not to make a future version of Git abort upon printing the warning.
> > + "Next time, run `git config pull.rebase (true|false)` first\n"
> > + "or pass --rebase, --no-rebase, or --ff-only on the command line.\n
>
> I am somewhat puzzled by "first, or". You certainly mean the config
> to be "set and forget", and you do not want to say "before you pull,
> do this first, always", but somehow the latter is the impression I
> got.
>
> But it does not sound to me like "Next time, and only next time, do
> this configuration. You can countermand the choice you make from
> the command line later if needed", which I think is what you meant
> to convey to your readers.
I'll send a new version that has a longer and more clear warning message.
-Alex
prev parent reply other threads:[~2020-02-29 21:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 1:09 [PATCH v2] pull: warn if the user didn't say whether to rebase or to merge Alex Henrie
2020-02-29 16:51 ` Junio C Hamano
2020-02-29 21:21 ` Alex Henrie [this message]
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=CAMMLpeSSET8F+BTooDhBTBGkh2JjvLWOPwA-ibspoDO0NqGy7A@mail.gmail.com \
--to=alexhenrie24@gmail.com \
--cc=annulen@yandex.ru \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=rcdailey.lists@gmail.com \
--cc=rsbecker@nexbridge.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.
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).