From: Junio C Hamano Date: Fri, 05 Aug 2016 22:48:44 GMT Subject: Re: [PATCH v5 4/9] status: collect per-file data for --porcelain=v2 Message-ID: In-Reply-To: <1470434434-64283-5-git-send-email-git@jeffhostetler.com> Jeff Hostetler 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 { ... } Thanks.