qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Emilio G. Cota" <cota@braap.org>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Laszlo Ersek <lersek@redhat.com>,
	qemu devel list <qemu-devel@nongnu.org>,
	Fam Zheng <famz@redhat.com>, Max Reitz <mreitz@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Stefan Hajnoczi <stefanha@gmail.com>,
	John Snow <jsnow@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns
Date: Tue, 27 Jun 2017 15:39:35 -0400	[thread overview]
Message-ID: <20170627193935.GA25367@flamenco> (raw)
In-Reply-To: <20170627221515-mutt-send-email-mst@kernel.org>

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" <mst@redhat.com>
> > > Cc: Eric Blake <eblake@redhat.com>
> > > Cc: Fam Zheng <famz@redhat.com>
> > > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > > Cc: John Snow <jsnow@redhat.com>
> > > Cc: Max Reitz <mreitz@redhat.com>
> > > Cc: Stefan Hajnoczi <stefanha@gmail.com>
> > > Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> > > ---
> > 
> > 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.

      reply	other threads:[~2017-06-27 19:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-02 21:01 [Qemu-devel] [PATCH v2] scripts: add "git.orderfile" for ordering diff hunks by pathname patterns Laszlo Ersek
2016-12-02 21:16 ` Eduardo Habkost
2016-12-02 21:54   ` Laszlo Ersek
2016-12-02 22:40     ` John Snow
2016-12-04 17:33 ` Michael S. Tsirkin
2016-12-05  0:30   ` Fam Zheng
2016-12-05  3:00     ` Michael S. Tsirkin
2016-12-05 10:24   ` Laszlo Ersek
2016-12-05 16:30     ` Eric Blake
2016-12-05 18:45     ` John Snow
2016-12-05 16:27   ` Eric Blake
2017-02-07 19:20 ` Eric Blake
2017-02-08  0:53   ` Laszlo Ersek
2017-06-27 18:51 ` Emilio G. Cota
2017-06-27 19:16   ` Michael S. Tsirkin
2017-06-27 19:39     ` Emilio G. Cota [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170627193935.GA25367@flamenco \
    --to=cota@braap.org \
    --cc=famz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).