git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 4/9] status: collect per-file data for --porcelain=v2

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 7, 2016, 08:34 UTC
Message-ID
<alpine.DEB.2.20.1608071026120.5786@virtualbox>
In-Reply-To
<xmqqbn16vnlf.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Fri, 5 Aug 2016, Junio C Hamano wrote:
Show 27 quoted lines
> Jeff Hostetler <git@jeffhostetler.com> writes:
> 
> >  		if (ce_stage(ce)) {
> >  			d->index_status = DIFF_STATUS_UNMERGED;
> >  			d->stagemask |= (1 << (ce_stage(ce) - 1));
> > +			/*
> > +			 * Don't bother setting {mode,oid}_{head,index} since the print
> > +			 * code will output the stage values directly and not use the
> > +			 * values in these fields.
> > +			 */
> >  		}
> > -		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.

BTW your suggestion has 24 extra spaces after the final closing brace ;-)

Ciao, Dscho

Previous: Junio C HamanoNext: Eric Wong
Message 15 of 19 in “status: V2 porcelain status”
  1. 0/9 status: V2 porcelain statusJeff Hostetler, Aug 5, 2016
  2. 2/9 status: cleanup API to wt_status_printJeff Hostetler, Aug 5, 2016
  3. 8/9 test-lib-functions.sh: Add lf_to_nulJeff Hostetler, Aug 5, 2016
  4. 6/9 status: print branch info with --porcelain=v2 --branchJeff Hostetler, Aug 5, 2016
  5. 9/9 status: unit tests for --porcelain=v2Jeff Hostetler, Aug 5, 2016
  6. Junio C HamanoAug 8, 2016
  7. Jeff HostetlerAug 10, 2016
  8. Junio C HamanoAug 10, 2016
  9. Jeff HostetlerAug 10, 2016
  10. 7/9 git-status.txt: describe --porcelain=v2 formatJeff Hostetler, Aug 5, 2016
  11. 3/9 status: support --porcelain[=<version>]Jeff Hostetler, Aug 5, 2016
  12. 1/9 status: rename long-format print routinesJeff Hostetler, Aug 5, 2016
  13. 4/9 status: collect per-file data for --porcelain=v2Jeff Hostetler, Aug 5, 2016
  14. Junio C HamanoAug 5, 2016
  15. Johannes SchindelinAug 7, 2016
  16. Eric WongAug 7, 2016
  17. Junio C HamanoAug 8, 2016
  18. 5/9 status: print per-file porcelain v2 status dataJeff Hostetler, Aug 5, 2016
  19. Junio C HamanoAug 5, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.