Re: [PATCH 4/4] status: support --no-ahead-behind in long status format.

From: Jeff King <peff@peff.net>
Date: Dec 20, 2017, 16:33 UTC
Message-ID: <20171220163301.GD31149@sigill.intra.peff.net>
In-Reply-To: <20171220144245.39401-5-git@jeffhostetler.com>

On Wed, Dec 20, 2017 at 02:42:45PM +0000, Jeff Hostetler wrote:

Show 11 quoted lines

> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> index ea029ad..9a2f209 100644
> --- a/Documentation/git-status.txt
> +++ b/Documentation/git-status.txt
> @@ -120,6 +120,9 @@ configuration variable documented in linkgit:git-config[1].
>  +
>  	In short format with --branch, '[different]' will printed rather
>  	than detailed ahead/behind counts.
> ++
> +	In long (normal) format, a simple out of date message will be
> +	printed rather than detailed ahead/behind counts.

Same asciidoc trickery here as in the first patch (and in the --short one, too, but I forgot to mention it).

Show 6 quoted lines

> +	} else if (no_ahead_behind) {
> +		strbuf_addf(sb, _("Your branch is out of date with '%s'.\n"),
> +			    base);
> +
> +		/* TODO Do we need a generic hint here? */
> +

I'm not sure what we'd advise here. I'd consider:

  git log --oneline --graph HEAD..@{upstream}

to see the actual differences, but that's a bit verbose. Is there an easy way to re-enable it? I guess repeating the command with "--ahead-behind" should do so.

-Peff