Re: [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns

[Emilio G. Cota]

On Tue, Jun 27, 2017 at 22:16:39 +0300, Michael S. Tsirkin wrote:
> On Tue, Jun 27, 2017 at 02:51:52PM -0400, Emilio G. Cota wrote:
> > On Fri, Dec 02, 2016 at 22:01:52 +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>
> > > ---
> > 
> > Refloating 6+ months later, but..
> > 
> > Someone please merge this! :-)
> > 
> >             E.
> 
> Users should be aware that if they do this, the need to
> supply -O /dev/null to git pull-request. Otherwise the
> diffstat is all scrambled and you can't figure out
> what's included.

I'd do the opposite: recommend passing '-O scripts/git.orderfile' to
git-format patch, and leave the default for all other commands.

                E.