From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9785 invoked by alias); 28 May 2015 13:44:11 -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 9761 invoked by uid 89); 28 May 2015 13:44:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 28 May 2015 13:44:09 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 53669287B1; Thu, 28 May 2015 09:44:07 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id nHTusKz6anh8; Thu, 28 May 2015 09:44:07 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 25A76D3D1E; Thu, 28 May 2015 09:44:07 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 4243140DAA; Thu, 28 May 2015 06:44:08 -0700 (PDT) Date: Thu, 28 May 2015 13:44:00 -0000 From: Joel Brobecker To: Phil Muldoon Cc: gdb Subject: Re: Personal branches and restrictions with GIT repository Message-ID: <20150528134408.GE3111@adacore.com> References: <5566E465.3080909@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5566E465.3080909@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2015-05/txt/msg00034.txt.bz2 > So this boils down to two questions: > > 1) Do we need this hook for personal branches? It's a hook aimed at users who are not very familiar with git and who might accidently do a merge instead of a rebase. Un understand that this can be felt as a PITA for more experienced git users, but it is a really easy mistake to make when one is not paying attention, and it is also quickly resolved. > > 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. -- Joel