From: Elijah Newren <newren@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
"Git mailing list" <git@vger.kernel.org>,
"Vít Ondruch" <vondruch@redhat.com>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH 2/2] pull: improve default warning
Date: Tue, 22 Jun 2021 19:20:00 -0700 [thread overview]
Message-ID: <CABPp-BEnPrg_tsqLtmj7Ag6JnR6ku_K3Uv65rdRu-j9_qMYhmA@mail.gmail.com> (raw)
In-Reply-To: <CAMMLpeTmYcJHf1t7VpOBakMZ_vtk+9bmLRTMA9ueghG6WwCRtA@mail.gmail.com>
On Tue, Jun 22, 2021 at 2:22 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
>
> On Tue, Jun 22, 2021 at 9:06 AM Elijah Newren <newren@gmail.com> wrote:
> >
> > On Mon, Jun 21, 2021 at 8:15 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
> > >
> > > My only serious objection to this patch is the instruction to merge if
> > > you don't know what to do instead of asking the repository maintainer
> > > what to do or reading the Git documentation. I don't have a strong
> > > opinion on the rest of the patch.
> >
> > You're not alone, Alex; I objected to that part as well. (See e.g.
> > https://lore.kernel.org/git/CABPp-BF4rXBOKsn8bG6y3QUEtNVV9K2Pk5NmwrU5818CqhRt_Q@mail.gmail.com/
> > and various other emails in that thread, ending with "agree to
> > disagree" later). I still object to it as I did then.
>
> Thanks for the link, and sorry for not having followed this
> conversation closely enough to have seen your previous replies. While
No worries, you were trying to be a good citizen by reviewing patches,
and the patches didn't come with links to the old threads (even if you
recursively followed links provided in each email as far as I can
tell), so I wouldn't expect you to know. But I saw you expressing
similar sentiments as I had previously so I dug out my old email and
linked it.
> we're on the subject, do you have any thoughts on what (if anything)
> more should be done before making the switch to aborting instead of
> merging with a warning in `git pull`?
I think Junio already answered that over here:
https://lore.kernel.org/git/xmqq360h8286.fsf@gitster.c.googlers.com/
(he discussed it multiple times in that thread, but hopefully that's a
good enough example).
next prev parent reply other threads:[~2021-06-23 2:20 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 17:52 [PATCH 0/2] pull: documentation improvements Felipe Contreras
2021-06-21 17:52 ` [PATCH 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-22 5:51 ` Bagas Sanjaya
2021-06-23 1:11 ` Felipe Contreras
2021-06-24 14:21 ` Philip Oakley
2021-06-24 14:31 ` Felipe Contreras
2021-06-24 16:59 ` Philip Oakley
2021-06-24 19:05 ` Felipe Contreras
2021-06-24 22:07 ` Philip Oakley
2021-06-24 23:41 ` Felipe Contreras
2021-06-25 9:12 ` Ævar Arnfjörð Bjarmason
2021-06-25 10:47 ` Felipe Contreras
2021-06-25 10:59 ` Ævar Arnfjörð Bjarmason
2021-06-25 15:49 ` Felipe Contreras
2021-06-25 16:53 ` Kerry, Richard
2021-06-25 17:34 ` Felipe Contreras
2021-06-25 21:36 ` Felipe Contreras
2021-06-21 17:52 ` [PATCH 2/2] pull: improve default warning Felipe Contreras
2021-06-21 18:05 ` Alex Henrie
2021-06-21 18:51 ` Felipe Contreras
2021-06-21 21:47 ` Alex Henrie
2021-06-21 22:12 ` Felipe Contreras
2021-06-22 3:15 ` Alex Henrie
2021-06-22 4:26 ` Felipe Contreras
2021-06-22 15:06 ` Elijah Newren
2021-06-22 21:22 ` Alex Henrie
2021-06-23 2:20 ` Elijah Newren [this message]
2021-06-23 4:18 ` Felipe Contreras
2021-06-23 6:47 ` Elijah Newren
2021-06-23 17:24 ` Felipe Contreras
2021-06-23 1:09 ` Felipe Contreras
2021-06-23 7:54 ` Elijah Newren
2021-06-23 18:19 ` Felipe Contreras
2021-06-24 3:38 ` Alex Henrie
2021-06-24 5:55 ` Felipe Contreras
2021-06-27 0:17 ` Alex Henrie
2021-06-27 4:21 ` Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 0/2] pull: documentation improvements Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 2/2] pull: improve default warning 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
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=CABPp-BEnPrg_tsqLtmj7Ag6JnR6ku_K3Uv65rdRu-j9_qMYhmA@mail.gmail.com \
--to=newren@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=vondruch@redhat.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).