From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDafQ-0002yo-BA for qemu-devel@nongnu.org; Sun, 04 Dec 2016 12:33:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDafN-0001yb-6w for qemu-devel@nongnu.org; Sun, 04 Dec 2016 12:33:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33284) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cDafN-0001y1-1e for qemu-devel@nongnu.org; Sun, 04 Dec 2016 12:33:33 -0500 Date: Sun, 4 Dec 2016 19:33:24 +0200 From: "Michael S. Tsirkin" Message-ID: <20161204192953-mutt-send-email-mst@kernel.org> References: <20161202210152.6880-1-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161202210152.6880-1-lersek@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laszlo Ersek Cc: qemu devel list , Eric Blake , Fam Zheng , Gerd Hoffmann , John Snow , Max Reitz , Stefan Hajnoczi On Fri, Dec 02, 2016 at 10:01:52PM +0100, 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: Max Reitz > Cc: Stefan Hajnoczi > Signed-off-by: Laszlo Ersek > --- > > Notes: > v2: > - "Makefile" -> "Makefile*" [Gerd] > - add leading comment [Gerd] > - add "docs/*" (note, there are *.txt files outside of docs/, so keeping > those too) [Max, Fam, Eric] > > scripts/git.orderfile | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 scripts/git.orderfile > > diff --git a/scripts/git.orderfile b/scripts/git.orderfile > new file mode 100644 > index 000000000000..3cab16e0505c > --- /dev/null > +++ b/scripts/git.orderfile > @@ -0,0 +1,20 @@ > +# Apply this diff order to your git configuration with the command > +# > +# git config diff.orderFile scripts/git.orderfile > + > +docs/* do we need this now? .txt is just below. > +*.txt > +configure > +GNUmakefile > +makefile > +Makefile* > +*.mak do these rules apply in each directory? I think they do but then I don't think we should list directories below. > +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 is the exact order or qapi files that important? I'd rather we stuck to simple wildcards without special casing visitors etc. > +*.c > -- > 2.9.2