Jeff Hostetler <g...@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 {
...
}
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
