From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/5] prompt: do not double-discriminate detached HEAD
Date: Tue, 18 Jun 2013 22:43:25 +0530 [thread overview]
Message-ID: <1371575608-9980-3-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371575608-9980-1-git-send-email-artagnon@gmail.com>
When GIT_PS1_SHOWCOLORHINTS is turned on, there is no need to put a
detached HEAD within parenthesis: the color can be used to discriminate
the detached HEAD.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
contrib/completion/git-prompt.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 9ed6ff1..a127d3b 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -392,7 +392,11 @@ __git_ps1 ()
test -z $b && b="$(git rev-parse --short HEAD)"
;;
esac
- b="($b)"
+
+ # if there is no color, use
+ # parenthesis to indicate that the
+ # HEAD is detached
+ test -n "${GIT_PS1_SHOWCOLORHINTS-}" || b="($b)"
}
fi
--
1.8.3.1.456.gb7f4cb6.dirty
next prev parent reply other threads:[~2013-06-18 17:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 17:13 [PATCH 0/5] Fix describe --contains --all Ramkumar Ramachandra
2013-06-18 17:13 ` [PATCH 1/5] prompt: clean up describe logic Ramkumar Ramachandra
2013-06-18 17:13 ` Ramkumar Ramachandra [this message]
2013-06-18 17:13 ` [PATCH 3/5] name-rev: fix assumption about --name-only usage Ramkumar Ramachandra
2013-06-18 17:13 ` [PATCH 4/5] name-rev: strip trailing ^0 in when --name-only Ramkumar Ramachandra
2013-06-18 17:13 ` [PATCH 5/5] name-rev doc: rewrite --stdin paragraph Ramkumar Ramachandra
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=1371575608-9980-3-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).