public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Jeff Hostetler <git@jeffhostetler•com>
Cc: git@vger•kernel.org, Jeff Hostetler <jeffhost@microsoft•com>
Subject: Re: [PATCH v5 4/9] status: collect per-file data for --porcelain=v2
Date: Fri, 05 Aug 2016 15:48:44 -0700	[thread overview]
Message-ID: <xmqqbn16vnlf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1470434434-64283-5-git-send-email-git@jeffhostetler.com> (Jeff Hostetler's message of "Fri, 5 Aug 2016 18:00:29 -0400")

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 {
                	...
		}                        

Thanks.

next prev parent reply	other threads:[~2016-08-06 20:05 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-05 22:00 [PATCH v5 0/9] status: V2 porcelain status Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 1/9] status: rename long-format print routines Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 2/9] status: cleanup API to wt_status_print Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 3/9] status: support --porcelain[=<version>] Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 4/9] status: collect per-file data for --porcelain=v2 Jeff Hostetler
2016-08-05 22:48   ` Junio C Hamano [this message]
2016-08-07  8:34     ` Johannes Schindelin
2016-08-07 22:29       ` Eric Wong
2016-08-08  1:57         ` Junio C Hamano
2016-08-05 22:00 ` [PATCH v5 5/9] status: print per-file porcelain v2 status data Jeff Hostetler
2016-08-05 22:51   ` Junio C Hamano
2016-08-05 22:00 ` [PATCH v5 6/9] status: print branch info with --porcelain=v2 --branch Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 7/9] git-status.txt: describe --porcelain=v2 format Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 8/9] test-lib-functions.sh: Add lf_to_nul Jeff Hostetler
2016-08-05 22:00 ` [PATCH v5 9/9] status: unit tests for --porcelain=v2 Jeff Hostetler
2016-08-08 17:07   ` Junio C Hamano
2016-08-10 21:28     ` Jeff Hostetler
2016-08-10 22:41       ` Junio C Hamano
2016-08-10 23:23         ` Jeff Hostetler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqbn16vnlf.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@jeffhostetler$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jeffhost@microsoft$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox