Re: [PATCH 2/5] merge-recursive: fix numerous argument alignment issues

From: Elijah Newren <newren@gmail.com>
Date: May 21, 2018, 16:48 UTC
Message-ID: <CABPp-BGR1jaGzVcqyCO=WYgdX3SKQoj9pzuKCvXoc7+R=OA8PQ@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.1805211542160.77@tvgsbejvaqbjf.bet>

Hi Dscho,

On Mon, May 21, 2018 at 6:42 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 9 quoted lines

> Hi Elijah,
>
> On Fri, 18 May 2018, Elijah Newren wrote:
>
>> Various refactorings throughout the code have left lots of alignment
>> issues that were driving me crazy; fix them.
>
> I hope you did not do that manually. What is your code formatting tool of
> choice?

Sorry to disappoint but it was manual. I noticed and fixed one of them many months ago, tossing it into a 'misc' branch. Then ran across another and added it. When I hit the third, I was annoyed and cleaned them all up -- and combined them with other changes into this series.

However, it's hard to call this formatting entirely manual. A quick regex found the relevant sites pretty easily, and 'M-x indent-region' (emacs) fixes the indentation for a block of lines all at once. I guess if I had taken the time to fix a few other emacs formatting rules, I could have highlighted the whole file and ran C-M-\ (a.k.a. indent-region), but didn't.

> The patch looks obviously good to me.

Thanks for taking a look!