From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <git@grubix•eu>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] status: show in-progress info for short status
Date: Mon, 17 Apr 2017 00:06:17 -0700 [thread overview]
Message-ID: <xmqqwpajikd2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <2c3c8028cd057428758bb1e21a064a264936de90.1490968428.git.git@grubix.eu> (Michael J. Gruber's message of "Fri, 31 Mar 2017 15:59:17 +0200")
Michael J Gruber <git@grubix•eu> writes:
> Ordinary (long) status shows information about bisect, revert, am,
> rebase, cherry-pick in progress, and so does git-prompt.sh. status
> --short currently shows none of this information.
>
> Introduce an `--inprogress` argument to git status so that, when used with
> `--short --branch`, in-progress information is shown next to the branch
> information. Just like `--branch`, this comes with a config option.
>
> The wording for the in-progress information is taken over from
> git-prompt.sh.
>
> Signed-off-by: Michael J Gruber <git@grubix•eu>
> ---
> When used with --porcelain, this gives an easy way to amend the powerline-gitstatus
> prompt for example (in use locally here), and certainly others.
>
> I don't touch --porcelain=v2 - that one reads in-progress state but does not seem
> to display it. I don't know which parts are supposed to be stable for v2.
>
> Documentation/config.txt | 4 +++
> Documentation/git-status.txt | 5 ++++
> builtin/commit.c | 13 ++++++++++
> t/t7512-status-help.sh | 58 ++++++++++++++++++++++++++++++++++++++++----
> wt-status.c | 32 +++++++++++++++++++++---
> wt-status.h | 1 +
> 6 files changed, 105 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 475e874d51..3adc65f9d3 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -2957,6 +2957,10 @@ status.branch::
> Set to true to enable --branch by default in linkgit:git-status[1].
> The option --no-branch takes precedence over this variable.
>
> +status.inprogress::
> + Set to true to enable --inprogress by default in linkgit:git-status[1].
> + The option --no-inprogress takes precedence over this variable.
> +
Has the name of the option been discussed already and the list
reached a consensus? "in progress" is a two-word phrase, and I am
wondering if this should be status.inProgress (and the option name
should be "--in-progress").
> +-p::
> +--inprogress::
> + When showing branch and tracking info in short-format,
> + show in-progress information (BISECTING, MERGING etc.), too.
> +
I do not think we want to give short-and-sweet "-p" to this option.
"git log -p" gives a patch output, "git status -p" sounds like it
does so, too (i.e. "git show" plus various status). Besides, for
those who are lazy, you already have a configuration variable.
prev parent reply other threads:[~2017-04-17 7:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 13:59 [PATCH] status: show in-progress info for short status Michael J Gruber
2017-03-31 18:14 ` Junio C Hamano
2017-04-07 14:14 ` Michael J Gruber
2017-04-07 16:18 ` Jacob Keller
2017-04-13 6:09 ` Junio C Hamano
2017-04-13 7:20 ` Jacob Keller
2017-05-11 2:45 ` Junio C Hamano
2017-04-13 7:21 ` Jacob Keller
2017-04-01 13:51 ` brian m. carlson
2017-04-06 14:33 ` SZEDER Gábor
2017-04-07 14:05 ` Michael J Gruber
2017-04-13 10:43 ` SZEDER Gábor
2017-04-17 7:06 ` Junio C Hamano [this message]
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=xmqqwpajikd2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@grubix$(echo .)eu \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox