From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCp2E-0006H6-8Z for qemu-devel@nongnu.org; Fri, 02 Dec 2016 09:42:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCp2B-00074O-BP for qemu-devel@nongnu.org; Fri, 02 Dec 2016 09:41:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCp2B-00073r-5K for qemu-devel@nongnu.org; Fri, 02 Dec 2016 09:41:55 -0500 Date: Fri, 2 Dec 2016 22:41:50 +0800 From: Fam Zheng Message-ID: <20161202144150.GA10190@lemon> References: <20161202104037.5456-1-lersek@redhat.com> <8259e744-9919-bfa7-4a98-28c1fcac13c7@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8259e744-9919-bfa7-4a98-28c1fcac13c7@redhat.com> Subject: Re: [Qemu-devel] [PATCH] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Laszlo Ersek , qemu devel list , "Michael S. Tsirkin" , Stefan Hajnoczi , Gerd Hoffmann , John Snow On Fri, 12/02 15:33, Max Reitz wrote: > On 02.12.2016 11:40, Laszlo Ersek wrote: > > When passed to git-diff (and to every other git command producing diffs > > and/or diffstats) with "-O" or "diff.orderFile", this list of patterns > > will place the more declarative / abstract hunks first, while changes to > > imperative code / details will be near the end of the patches. This saves > > on scrolling / searching and makes for easier reviewing. > > > > We intend to advise contributors in the Wiki to run > > > > git config diff.orderFile scripts/git.orderfile > > > > once, as part of their initial setup, before formatting their first (or, > > for repeat contributors, next) patches. > > > > See the "-O" option and the "diff.orderFile" configuration variable in > > git-diff(1) and git-config(1). > > > > Cc: "Michael S. Tsirkin" > > Cc: Eric Blake > > Cc: Fam Zheng > > Cc: Gerd Hoffmann > > Cc: John Snow > > Cc: Stefan Hajnoczi > > Signed-off-by: Laszlo Ersek > > --- > > > > Notes: > > I think I managed to incorporate everyone's feedback! > > > > scripts/git.orderfile | 15 +++++++++++++++ > > 1 file changed, 15 insertions(+) > > create mode 100644 scripts/git.orderfile > > > > diff --git a/scripts/git.orderfile b/scripts/git.orderfile > > new file mode 100644 > > index 000000000000..600a2e4fc540 > > --- /dev/null > > +++ b/scripts/git.orderfile > > @@ -0,0 +1,15 @@ > > +*.txt > > We also have *.md. (OK, OK, we have a single docs/bitmaps.md, but maybe > it's going to be more in the future. :-)) Maybe just insert 'docs/*' here? I'm not sure if it works for the subdirs, though. Fam > > Max > > > +configure > > +GNUmakefile > > +makefile > > +Makefile > > +*.mak > > +qapi-schema*.json > > +qapi/*.json > > +include/qapi/visitor.h > > +include/qapi/visitor-impl.h > > +scripts/qapi.py > > +scripts/*.py > > +*.h > > +qapi/qapi-visit-core.c > > +*.c > > > >