[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering di
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns |
Date: |
Sun, 4 Dec 2016 19:33:24 +0200 |
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" <address@hidden>
> Cc: Eric Blake <address@hidden>
> Cc: Fam Zheng <address@hidden>
> Cc: Gerd Hoffmann <address@hidden>
> Cc: John Snow <address@hidden>
> Cc: Max Reitz <address@hidden>
> Cc: Stefan Hajnoczi <address@hidden>
> Signed-off-by: Laszlo Ersek <address@hidden>
> ---
>
> 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