From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git <git@vger.kernel.org>, "Elijah Newren" <newren@gmail.com>,
"Jeff King" <peff@peff.net>, "Vít Ondruch" <vondruch@redhat.com>
Subject: Re: [PATCH v5 3/3] pull: display default warning only when non-ff
Date: Mon, 14 Dec 2020 15:40:49 -0600 [thread overview]
Message-ID: <5fd7dbe1eb26d_d5985208e1@natae.notmuch> (raw)
In-Reply-To: <xmqqo8iwje0h.fsf@gitster.c.googlers.com>
Junio C Hamano wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
> >> The original author of this test cared that pulling c1 with --rebase
> >> into c0 succeeds, and that it does not give the error message.
> >
> > I prefer not to attempt to read minds (plus, the author might have not
> > cared that the pulling succeeds), and anyway; that's not what matters.
> > ...
> > Again, I don't particularly care to mindread what the test authors might
> > have cared about.
>
> You do not have to read mind. What is written in the test is clear
> enough: run "git pull --rebase . c1" into c0 and see what happens.
That is precisely my point: it is written in the test, no mindreading
neccessary.
--
Felipe Contreras
next prev parent reply other threads:[~2020-12-14 21:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 10:05 [PATCH v5 0/3] pull: stop warning on every pull Felipe Contreras
2020-12-10 10:05 ` [PATCH v5 1/3] pull: refactor fast-forward check Felipe Contreras
2020-12-11 6:54 ` Junio C Hamano
2020-12-12 15:18 ` Felipe Contreras
2020-12-10 10:05 ` [PATCH v5 2/3] pull: move default warning Felipe Contreras
2020-12-11 6:54 ` Junio C Hamano
2020-12-11 7:55 ` Felipe Contreras
2020-12-12 0:00 ` Junio C Hamano
2020-12-12 1:05 ` Felipe Contreras
2020-12-13 20:58 ` Junio C Hamano
2020-12-14 11:02 ` Felipe Contreras
2020-12-12 16:42 ` Felipe Contreras
2020-12-10 10:05 ` [PATCH v5 3/3] pull: display default warning only when non-ff Felipe Contreras
2020-12-11 7:16 ` Junio C Hamano
2020-12-11 12:48 ` Felipe Contreras
2020-12-11 23:56 ` Junio C Hamano
2020-12-12 1:01 ` Felipe Contreras
2020-12-12 2:11 ` Junio C Hamano
2020-12-12 16:01 ` Felipe Contreras
2020-12-14 21:04 ` Junio C Hamano
2020-12-14 21:40 ` Felipe Contreras [this message]
2020-12-11 7:17 ` [PATCH v5 0/3] pull: stop warning on every pull Junio C Hamano
2020-12-11 13:28 ` Felipe Contreras
2020-12-12 2:50 ` Junio C Hamano
2020-12-12 16:36 ` Felipe Contreras
2020-12-14 0:57 ` Felipe Contreras
-- strict thread matches above, loose matches on Subject: below --
2020-12-12 16:52 Felipe Contreras
2020-12-12 16:52 ` [PATCH v5 3/3] pull: display default warning only when non-ff 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=5fd7dbe1eb26d_d5985208e1@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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).