On 02/05/16 10:50, Ryan Harkin wrote:
On 4 February 2016 at 21:00, Carsey, Jaben jaben.carsey@intel.com wrote:
-----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Laszlo Ersek Sent: Thursday, February 04, 2016 12:23 PM To: Ryan Harkin ryan.harkin@linaro.org Cc: Ard Biesheuvel ard.biesheuvel@linaro.org; Justen, Jordan L jordan.l.justen@intel.com; edk2-devel@ml01.01.org; Leif Lindholm leif.lindholm@linaro.org; linaro-uefi@lists.linaro.org; Carsey, Jaben jaben.carsey@intel.com Subject: Re: [edk2] [PATCH v2 6/6] Revert "ArmPlatformPkg: Create an ARM Platform DSC / FDF / ArmPlatformLib template" Importance: High
(5) I order the files in my diffs so that the descriptive files go first (dec, dsc, fdf, inf), the C language header files, and HII forms, second, and the C source code last. In my experience, seeing the header changes before the C code changes makes a huge difference.
For this, create a text file like:
*.dec *.dsc.inc *.dsc *.fdf *.inf *.h *.vfr
*.c
That's generally a good idea.
Occasionally, I change pairs of .dsc and .fdf files at the same time and unfortunately this will split them. Eg:
This:
ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf ArmPlatformPkg/ArmPlatformPkg.dsc ArmPlatformPkg/ArmPlatformPkg.fdf
Would become this:
ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc ArmPlatformPkg/ArmPlatformPkg.dsc ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf ArmPlatformPkg/ArmPlatformPkg.fdf
So I guess the I just need to apply a bit of intelligence to when I use the order file.
Right, I've been missing a git feature where I can attach git-format-patch options permanently to a patch -- clearly in my own clone only. (Similarly to git-notes, but with a different purpose.)
For formatting individual patches with particular settings, the command line is good enough, but when you have a long series, and you need --find-copies-harder for one or two patches only, or you want to turn the -O/.../order-file thing *off* for just one or two patches, it gets messy.
Thanks Laszlo