From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 118842 invoked by alias); 28 May 2015 14:03:02 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 118771 invoked by uid 89); 28 May 2015 14:03:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 28 May 2015 14:02:51 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 5840419F3A0; Thu, 28 May 2015 14:02:50 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4SE2mnG011792; Thu, 28 May 2015 10:02:49 -0400 Message-ID: <55672007.2080805@redhat.com> Date: Thu, 28 May 2015 14:03:00 -0000 From: Phil Muldoon MIME-Version: 1.0 To: Joel Brobecker CC: gdb Subject: Re: Personal branches and restrictions with GIT repository References: <5566E465.3080909@redhat.com> <20150528134408.GE3111@adacore.com> In-Reply-To: <20150528134408.GE3111@adacore.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-05/txt/msg00035.txt.bz2 On 28/05/15 14:44, Joel Brobecker wrote: > > 2) And are users allowed to do whatever they want in their own > personal branch (within sane defaults)? > > To answer your two questions, I think it boils down to policy > rather than need. The hooks should accomodate the policy. > > We can turn all pre-commit checks for user-branches. I don't believe > that the hooks, as currently implemented, support turning off just > that "accidental merge" check. The latter can, of course, be easily > implemented. > > FWIW, my take is that if you're going to have your branch hosted > on the sourceware git, it's not a big effort to be following the same > guidelines as other official branches. But if people want it otherwise, > then we can adjust the hooks. Yeah I think this is the question really. And to reiterate not talking about Master here, just personal branches. Are we free (in the case of a merge commit to a personal branch), to ignore the hook and commit anyway? Is it a suggestion or a directive? That's the crux of the matter. I've not checked the wiki yet. Maybe some guidelines for personal branches and/or master branches would be ideal. I'll volunteer to get one started if nobody else does. Just need to know the said guidelines first ;) Cheers Phil