Re: [PATCH v5 4/9] status: collect per-file data for --porcelain=v2
- From
- Eric Wong <e@80x24.org>
- Date
- Aug 7, 2016, 22:29 UTC
- Message-ID
- <20160807222903.GA462@starla>
- In-Reply-To
- <alpine.DEB.2.20.1608071026120.5786@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 26 quoted lines
> On Fri, 5 Aug 2016, Junio C Hamano wrote:
> > Jeff Hostetler <git@jeffhostetler.com> writes:
> > > }
> > > - else
> > > + else {
> > > d->index_status = DIFF_STATUS_ADDED;
> > > + /* Leave {mode,oid}_head zero for adds. */
> > > + d->mode_index = ce->ce_mode;
> > > + hashcpy(d->oid_index.hash, ce->sha1);
> > > + }
> >
> > Not a big deal (no need to resend for this one alone), but let's
> > make the above properly formatted, i.e.
> >
> > if (ce_stage(ce)) {
> > ...
> > } else {
> > ...
> > }
>
> Do I understand correctly that your objections is against having the curly
> brace before the "else" on its own line?
>
> If so, when did our coding style change? I vividly remember that we
> strongly favored putting the "else" on a new line after a closing brace,
> to make diffs nicer in case the braces were removed or added.AFAIK, Linux kernel CodingStyle has always been what Junio suggested (just w/o the trailing spaces :), and we inherit from that.
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/CodingStyle
> BTW your suggestion has 24 extra spaces after the final closing brace ;-)