From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH 0/3] Reject non-ff pulls by default Date: Mon, 09 Sep 2013 22:47:20 +0200 Message-ID: References: <20130904081047.GB2582@serenity.lan> <20130904092527.GB22348@sigill.intra.peff.net> <20130908041805.GB14019@sigill.intra.peff.net> <20130908172605.GF5359@vauxhall.crustytoothpaste.net> <20130909000153.GG5359@vauxhall.crustytoothpaste.net> Mime-Version: 1.0 Content-Type: text/plain Cc: Felipe Contreras , "brian m. carlson" , Jeff King , John Keeping , git@vger.kernel.org, Andreas Krey To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Sep 09 22:47:57 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VJ8NI-0005JM-Ag for gcvg-git-2@plane.gmane.org; Mon, 09 Sep 2013 22:47:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755517Ab3IIUrw (ORCPT ); Mon, 9 Sep 2013 16:47:52 -0400 Received: from mx1.imag.fr ([129.88.30.5]:40504 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755325Ab3IIUrv (ORCPT ); Mon, 9 Sep 2013 16:47:51 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id r89KlI7O008114 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 9 Sep 2013 22:47:18 +0200 Received: from anie.imag.fr ([129.88.7.32]) by mail-veri.imag.fr with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1VJ8Mi-0004K5-UO; Mon, 09 Sep 2013 22:47:21 +0200 In-Reply-To: (Junio C. Hamano's message of "Mon, 09 Sep 2013 11:47:45 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Mon, 09 Sep 2013 22:47:19 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: r89KlI7O008114 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1379364443.50975@wpbhdj+hPXT7ENOcJiC4kA Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano 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. > 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/