git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
To: git@vger.kernel.org
Cc: Steffen Prohaska <prohaska@zib.de>, Alexander Hirsch <1zeeky@gmail.com>
Subject: [PATCH] status: allow branch info color customization
Date: Wed, 16 Oct 2013 10:22:53 +0200	[thread overview]
Message-ID: <1381911773-9564-1-git-send-email-1zeeky@gmail.com> (raw)

From: Alexander Hirsch <1zeeky@gmail.com>

git status -bs (--branch --short) does not seem to allow customization of the
colors for the local and remote branch.
This patch adds these via the color.status.local and color.status.remote
config variables.

Given the trivial nature of this patch I did not write a test for it. I did a
small check that it's working so, to be on the safe side.

Signed-off-by: Alexander Hirsch <1zeeky@gmail.com>
---
 Documentation/config.txt | 7 +++++--
 builtin/commit.c         | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d4d93c9..261fc99 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -904,9 +904,12 @@ color.status.<slot>::
 	`added` or `updated` (files which are added but not committed),
 	`changed` (files which are changed but not added in the index),
 	`untracked` (files which are not tracked by Git),
-	`branch` (the current branch), or
+	`branch` (the current branch),
 	`nobranch` (the color the 'no branch' warning is shown in, defaulting
-	to red). The values of these variables may be specified as in
+	to red),
+	`local` (the local branch when showing branch info), or
+	`remote` (the remote-tracked branch when showing branch info).
+	The values of these variables may be specified as in
 	color.branch.<slot>.
 
 color.ui::
diff --git a/builtin/commit.c b/builtin/commit.c
index 6ab4605..43365b4 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1165,6 +1165,10 @@ static int parse_status_slot(const char *var, int offset)
 		return WT_STATUS_HEADER;
 	if (!strcasecmp(var+offset, "branch"))
 		return WT_STATUS_ONBRANCH;
+	if (!strcasecmp(var+offset, "local"))
+		return WT_STATUS_LOCAL_BRANCH;
+	if (!strcasecmp(var+offset, "remote"))
+		return WT_STATUS_REMOTE_BRANCH;
 	if (!strcasecmp(var+offset, "updated")
 		|| !strcasecmp(var+offset, "added"))
 		return WT_STATUS_UPDATED;
-- 
1.8.4.1

             reply	other threads:[~2013-10-16  8:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-16  8:22 Alexander 'z33ky' Hirsch [this message]
2013-10-16 21:39 ` [PATCH] status: allow branch info color customization Junio C Hamano

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=1381911773-9564-1-git-send-email-1zeeky@gmail.com \
    --to=1zeeky@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=prohaska@zib.de \
    /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.
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 NNTP newsgroup(s).