Re: [PATCH 0/3] Reject non-ff pulls by default

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 9, 2013, 20:47 UTC
Message-ID: <vpqbo41lo2v.fsf@anie.imag.fr>
In-Reply-To: <xmqq1u4x4yst.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> You are in favor of an _option_ to allow people to forbid a pull in
> a non-ff situation, and I think other people are also in
> agreement.

Yes. Having an option can't harm anybody, and there's a clear demand for that.

Show 8 quoted lines

> So perhaps:
>
>  - drop jc/pull-training-wheel and revert its merge from 'next';
>
>  - update Felipe's series with a bit of tweak to make it less
>    impactful by demoting error into warning and advice.
>
> would be a good way forward?

I didn't follow very closely the discussions and patch series, but that would sound right to me. The last version of Felipes' patch series already gives a warning only, but the wording and commit message implies that this will become an error in the future (this is the part with which I disagree).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/