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:16:00 -0700 [thread overview]
Message-ID: <xmqqy4ymeihb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <53614470489f9_f9b15012ecbc@nysa.notmuch> (Felipe Contreras's message of "Wed, 30 Apr 2014 13:44:00 -0500")
Felipe Contreras <felipe.contreras@gmail•com> writes:
>> - With the endgame of "out of box Git without any configuration
>> refuses 'git pull' (without --merge/--rebase) that does not
>> fast forward" in mind, start warning "In the future you will
>> have to either set pull.mode (and/or its friends) or type
>> "pull --merge" (or "pull --rebase") when the endgame version
>> of 'git pull' would fail with the error message, but still do
>> as was asked to do as before. At this step, existing users
>> can set pull.mode to "merge" or "rebase" or whatever to
>> squelch the warning.
>>
>> - Flip the default. By the time this happens, thanks to the
>> previous step to warn beforehand, nobody needs to see the
>> warning. (your step 4)
>
> This is what my last version of the series did[1]. However, my plan was
> to land this in 1.x so users could see the warning, and then flip the
> switch on 2.0.
>
> 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?
next prev parent reply other threads:[~2014-04-30 19:16 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 [this message]
2014-04-30 19:22 ` Felipe Contreras
2014-04-30 19:52 ` Junio C Hamano
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=xmqqy4ymeihb.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=a.krey@gmx$(echo .)de \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=john@keeping$(echo .)me.uk \
--cc=peff@peff$(echo .)net \
--cc=philipoakley@iee$(echo .)org \
--cc=rhansen@bbn$(echo .)com \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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