From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line Date: Tue, 29 Oct 2013 09:26:14 +0100 Message-ID: References: <20131024122255.GI9378@mwanda> <20131024122512.GB9534@mwanda> <20131026181709.GB10488@kroah.com> <20131027013402.GA7146@leaf> <526CA7D4.1070904@alum.mit.edu> <20131027071407.GA11683@leaf> <526E283A.1070801@alum.mit.edu> <20131029020824.GE11861@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain Cc: Johan Herland , Michael Haggerty , Josh Triplett , Git mailing list , Dan Carpenter , Greg KH , ksummit-2013-discuss@lists.linuxfoundation.org, ksummit-attendees@lists.linuxfoundation.org, Linux Kernel mailing list To: Jeff King X-From: linux-kernel-owner@vger.kernel.org Tue Oct 29 09:26:52 2013 Return-path: Envelope-to: glk-linux-kernel-3@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vb4dY-00014o-70 for glk-linux-kernel-3@plane.gmane.org; Tue, 29 Oct 2013 09:26:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753706Ab3J2I0p (ORCPT ); Tue, 29 Oct 2013 04:26:45 -0400 Received: from mx2.imag.fr ([129.88.30.17]:57436 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753648Ab3J2I0m (ORCPT ); Tue, 29 Oct 2013 04:26:42 -0400 Received: from globule.imag.fr (globule.imag.fr [129.88.34.238]) by rominette.imag.fr (8.13.8/8.13.8) with ESMTP id r9T8QENj004279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 29 Oct 2013 09:26:14 +0100 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) (authenticated bits=0) by globule.imag.fr (8.13.8/8.13.8) with ESMTP id r9T8QFFo001326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 29 Oct 2013 09:26:15 +0100 In-Reply-To: <20131029020824.GE11861@sigill.intra.peff.net> (Jeff King's message of "Mon, 28 Oct 2013 22:08:24 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (rominette.imag.fr [129.88.30.17]); Tue, 29 Oct 2013 09:26:15 +0100 (CET) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: r9T8QENj004279 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1383639977.58656@6SqBwupxyjeGbuYGDVtwJQ Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Archived-At: Jeff King writes: > We could probably make this friendlier by reading from ~/.githooks > and defining some semantics for multiple hooks. I'd be all for it, except I'd call this ~/.config/git/hooks/* (or $XDG_CONFIG_HOME if set). > E.g., fall back to ~/.githooks if the repo hook is not > executable, or possibly run them both I think running them both would be the best option. Otherwise, adding a (possibly trivial) hook to a repo would disable the user-wide one, that'd feel weird. -- Matthieu Moy http://www-verimag.imag.fr/~moy/