From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Triplett Subject: Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line Date: Sun, 27 Oct 2013 09:20:20 +0000 Message-ID: <20131027092019.GB13149@leaf> References: <20131024122255.GI9378@mwanda> <20131024122512.GB9534@mwanda> <20131026181709.GB10488@kroah.com> <20131027013402.GA7146@leaf> <526CA7D4.1070904@alum.mit.edu> <20131027071407.GA11683@leaf> <874n83m8xv.fsf@linux-k42r.v.cablecom.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Michael Haggerty , git@vger.kernel.org, Dan Carpenter , Greg KH , ksummit-2013-discuss@lists.linuxfoundation.org, ksummit-attendees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org To: Thomas Rast X-From: linux-kernel-owner@vger.kernel.org Sun Oct 27 10:20:37 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 1VaMWP-0000ZC-44 for glk-linux-kernel-3@plane.gmane.org; Sun, 27 Oct 2013 10:20:33 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329Ab3J0JUZ (ORCPT ); Sun, 27 Oct 2013 05:20:25 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57415 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751331Ab3J0JUY (ORCPT ); Sun, 27 Oct 2013 05:20:24 -0400 Received: from mfilter12-d.gandi.net (mfilter12-d.gandi.net [217.70.178.129]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id EBAB9172070; Sun, 27 Oct 2013 10:20:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter12-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter12-d.gandi.net (mfilter12-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id rlhOAJhW2wsJ; Sun, 27 Oct 2013 10:20:21 +0100 (CET) X-Originating-IP: 77.221.165.98 Received: from leaf (ip-77-221-165-98.dsl.twang.net [77.221.165.98]) (Authenticated sender: josh@joshtriplett.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id A6D63172081; Sun, 27 Oct 2013 10:20:20 +0100 (CET) Content-Disposition: inline In-Reply-To: <874n83m8xv.fsf@linux-k42r.v.cablecom.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Archived-At: On Sun, Oct 27, 2013 at 09:09:32AM +0100, Thomas Rast wrote: > Josh Triplett writes: > > > On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: > >> But I don't think that this feature should be given the "-f" short > >> option, as (a) -f often means "force"; (b) it will increase the > >> confusion with --fixup; (c) it just doesn't strike me as being likely to > >> be such a frequently-used option (though if this changes over time the > >> "-f" option could always be granted to it later). > > > > (a) -n often means --dry-run, but for commit it means --no-verify. > > Different commands have different options, and commit doesn't have a > > --force to abbreviate as -f. > > > > (b) If anything, I think the existence of a short option will make the > > distinction more obvious, since -f and --fixup are much less similar > > than --fixes and --fixup. Most users will never type --fixes, making > > confusion unlikely. > > > > (c) Short option letters tend to be first-come first-serve unless > > there's a strong reason to do otherwise. Why reserve 'f' for some > > hypothetical future option that doesn't exist yet? > > No, lately the direction in Git has been to avoid giving options a > one-letter shorthand until they have proven so useful that people using > it in the wild start to suggest that it should have one. > > See e.g. > > http://article.gmane.org/gmane.comp.version-control.git/233998 > http://article.gmane.org/gmane.comp.version-control.git/168748 Fair enough; easy enough to drop -f if that's the consensus. However... > A much better argument would be if it was already clear from the specs > laid out for Fixes that n% of the kernel commits will end up having this > footer, and thus kernel hackers will spend x amount of time spelling out > --fixes and/or confusing it with --fixup to much headache. ...good suggestion: ~/src/linux$ git log --grep='stable@' --oneline --since='1 year ago' | wc -l 2769 ~/src/linux$ git log --grep='stable@' --oneline --since='1 year ago' --pretty=format:%an | sort -u | wc -l 839 Several thousand commits per year by hundreds of unique people seems like enough to justify a short option. - Josh Triplett