From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: "Eduardo R. D'Avila" <erdavila@gmail.com>,
"SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH] prompt: do not double-discriminate detached HEAD
Date: Sun, 7 Jul 2013 18:22:45 +0530 [thread overview]
Message-ID: <1373201565-14030-1-git-send-email-artagnon@gmail.com> (raw)
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>
---
For cuteness :)
contrib/completion/git-prompt.sh | 5 ++++-
t/t9903-bash-prompt.sh | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index a81ef5a..37e66a2 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -372,7 +372,10 @@ __git_ps1 ()
esac 2>/dev/null)" ||
b="$short_sha..."
- b="($b)"
+ # if there is no color, use
+ # parenthesis to indicate that the
+ # HEAD is detached
+ test -n "${GIT_PS1_SHOWCOLORHINTS-}" || b="($b)"
fi
fi
fi
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 3c3e4e8..c44b1a6 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -450,7 +450,7 @@ test_expect_success 'prompt - bash color pc mode - branch name' '
'
test_expect_success 'prompt - bash color pc mode - detached head' '
- printf "BEFORE: (${c_red}(%s...)${c_clear}):AFTER" $(git log -1 --format="%h" b1^) >expected &&
+ printf "BEFORE: (${c_red}%s...${c_clear}):AFTER" $(git log -1 --format="%h" b1^) >expected &&
git checkout b1^ &&
test_when_finished "git checkout master" &&
(
--
1.8.3.2.737.gcbc076a.dirty
next reply other threads:[~2013-07-07 12:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 12:52 Ramkumar Ramachandra [this message]
2013-07-07 13:35 ` [PATCH] prompt: do not double-discriminate detached HEAD John Szakmeister
2013-07-07 17:53 ` Junio C Hamano
2013-07-07 18:32 ` Kyle McKay
2013-07-08 13:49 ` Ramkumar Ramachandra
2013-07-08 1:12 ` Eduardo R. D'Avila
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=1373201565-14030-1-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=erdavila@gmail.com \
--cc=git@vger.kernel.org \
--cc=szeder@ira.uka.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.
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).