From: Junio C Hamano <gitster@pobox.com>
To: Stephen Kent <smkent@smkent.net>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH] Add color slots for branch names in "git status --short --branch"
Date: Wed, 19 Apr 2017 23:30:14 -0700 [thread overview]
Message-ID: <xmqqzifb8ubt.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <201704556286334.8b7dc718029e6dd189dadb3703bfa@localhost> (Stephen Kent's message of "Wed, 19 Apr 2017 22:57:08 -0700")
Stephen Kent <smkent@smkent.net> writes:
> Subject: Re: [PATCH] Add color slots for branch names in "git status --short --branch"
We spell one-liner title of our commits as "<area>: <summary>"
typically. In this case, this is about the output from the status
command, so
status: make the color used "--shrot --branch" output configurable
or something, perhaps?
> Signed-off-by: Stephen Kent <smkent@smkent.net>
> ---
> Documentation/config.txt | 5 ++++-
> builtin/commit.c | 4 ++++
> contrib/completion/git-completion.bash | 2 ++
> 3 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 475e874..96e9cf8 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1137,7 +1137,10 @@ color.status.<slot>::
> `untracked` (files which are not tracked by Git),
> `branch` (the current branch),
> `nobranch` (the color the 'no branch' warning is shown in, defaulting
> - to red), or
> + to red),
> + `localBranch` or `remoteBranch` (the local and remote branch names,
> + respectively, when branch and tracking information is displayed in the
> + status short-format), or
> `unmerged` (files which have unmerged changes).
OK.
> color.ui::
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 4e288bc..43846d5 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1263,6 +1263,10 @@ static int parse_status_slot(const char *slot)
> return WT_STATUS_NOBRANCH;
> if (!strcasecmp(slot, "unmerged"))
> return WT_STATUS_UNMERGED;
> + if (!strcasecmp(slot, "localBranch"))
> + return WT_STATUS_LOCAL_BRANCH;
> + if (!strcasecmp(slot, "remoteBranch"))
> + return WT_STATUS_REMOTE_BRANCH;
> return -1;
> }
OK.
I know we do not test color.status.<slot> at all (other than t4026
that makes sure a configuration from future version of Git that
specifies a slot that is not yet known to our version of Git is
safely ignored without triggering an error), but perhaps we would
want a new test or two at the end of t7508?
Thanks.
next prev parent reply other threads:[~2017-04-20 6:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-20 5:57 [PATCH] Add color slots for branch names in "git status --short --branch" Stephen Kent
2017-04-20 6:16 ` Jeff King
2017-04-20 6:30 ` Junio C Hamano [this message]
2017-04-22 5:40 ` Stephen Kent
2017-04-27 8:54 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzifb8ubt.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=smkent@smkent.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).