From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Andreas Krey <a.krey@gmx.de>,
John Keeping <john@keeping.me.uk>, Jeff King <peff@peff.net>,
Richard Hansen <rhansen@bbn.com>,
Philip Oakley <philipoakley@iee.org>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v5 0/6] Reject non-ff pulls by default
Date: Wed, 30 Apr 2014 12:52:15 -0700 [thread overview]
Message-ID: <xmqqppjyegsw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <53614d8c23d6_2aa5fa32f06@nysa.notmuch> (Felipe Contreras's message of "Wed, 30 Apr 2014 14:22:52 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Junio C Hamano wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>> ...
>> > This plan, however, fell off the cliff.
>>
>> Yeah, I see that $gmane/234488 explains why the second step in the
>> previous one stopped. I guess it was in expecting a reroll state,
>> waiting for that other topic (I do not remember offhand) to
>> graduate.
>>
>> I see nothing touching the affected codepaths now, so this time
>> around we may have a better chance, perhaps?
>
> A chance of what?
A chance not to have the plan "fell off the cliff".
> Do you want me to reroll to include the future
> backwards-incompatible change warning?
Yes, as I said in the other thread ($gmane/247758), if you do not
have that step yet (I haven't looked at the implementation while
discussing the design in this thread and looking at patches in other
topics) I'd strongly recommend adding one.
> Should I include the patch that turns the switch?
Sorry, but you lost me here. Turns what switch to what value?
next prev parent reply other threads:[~2014-04-30 19:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 11:17 [PATCH v5 0/6] Reject non-ff pulls by default Felipe Contreras
2014-04-29 11:17 ` [PATCH v5 1/6] pull: rename pull.rename to pull.mode Felipe Contreras
2014-04-29 12:24 ` Marat Radchenko
2014-04-29 13:32 ` Felipe Contreras
2014-04-29 21:54 ` Philip Oakley
2014-04-29 22:05 ` Felipe Contreras
2014-04-29 23:00 ` Philip Oakley
2014-04-30 20:26 ` Richard Hansen
2014-04-29 11:17 ` [PATCH v5 2/6] pull: migrate all the tests " Felipe Contreras
2014-04-29 11:17 ` [PATCH v5 3/6] pull: refactor $rebase variable into $mode Felipe Contreras
2014-04-29 11:17 ` [PATCH v5 4/6] pull: add --merge option Felipe Contreras
2014-04-29 11:17 ` [PATCH v5 5/6] pull: add merge-ff-only option Felipe Contreras
2014-04-29 11:17 ` [PATCH v5 6/6] pull: only allow ff merges by default Felipe Contreras
2014-04-30 17:55 ` [PATCH v5 0/6] Reject non-ff pulls " Junio C Hamano
2014-04-30 18:44 ` Felipe Contreras
2014-04-30 19:16 ` Junio C Hamano
2014-04-30 19:22 ` Felipe Contreras
2014-04-30 19:52 ` Junio C Hamano [this message]
2014-04-30 19:28 ` 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=xmqqppjyegsw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=rhansen@bbn.com \
--cc=sandals@crustytoothpaste.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.