From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH] diff: add a config option to control orderfile Date: Wed, 4 Sep 2013 00:08:15 +0300 Message-ID: <20130903210815.GB24480@redhat.com> References: <20130831194425.GA14706@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Sep 03 23:06:25 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 1VGxnq-00089d-CK for gcvg-git-2@plane.gmane.org; Tue, 03 Sep 2013 23:06:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760886Ab3ICVGQ (ORCPT ); Tue, 3 Sep 2013 17:06:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7937 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760841Ab3ICVGP (ORCPT ); Tue, 3 Sep 2013 17:06:15 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r83L6Dq8001325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 Sep 2013 17:06:13 -0400 Received: from redhat.com (vpn1-6-201.ams2.redhat.com [10.36.6.201]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r83L6B1I012233; Tue, 3 Sep 2013 17:06:12 -0400 Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Sep 03, 2013 at 10:12:18AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > I always want my diffs to show header files first, > > then .c files, then the rest. Make it possible to > > set orderfile though a config option to achieve this. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > I admit that I was the guilty one who introduced the orderfile, but > I think the feature was misguided (for one thing, it breaks the > patch-id, I think). This should be easy to fix - just sort before applying the ID, no? > So I am moderately hesitant to promote its use > with an addition like this. The status quo just makes people insist on using a script to generate patches for mail. Some projects put interface documentation in the header files, in that case it makes sense to put .h before .c in the patch as it makes review easier. In fact I sometimes reorder chunks in the patch manually for readability - it's probably worth finding a way to support this. > > diff.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/diff.c b/diff.c > > index 208094f..cca0767 100644 > > --- a/diff.c > > +++ b/diff.c > > @@ -264,6 +264,9 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) > > return 0; > > } > > > > + if (!strcmp(var, "diff.orderfile")) > > + return git_config_string(&default_diff_options.orderfile, var, value); > > + > > if (!prefixcmp(var, "submodule.")) > > return parse_submodule_config_option(var, value);