[PATCH] prompt: do not double-discriminate detached HEAD

2013-07-07 Thread Ramkumar Ramachandra 
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 artag...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] prompt: do not double-discriminate detached HEAD

2013-07-07 Thread John Szakmeister 
On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra artag...@gmail.com wrote:
 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 artag...@gmail.com
 ---
  For cuteness :)

Personally, I'd rather see the parens kept.  Not everyone sees red
very well--I know several people who can't see it at all, and it keeps
it consistent with non-colored output.

-John
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] prompt: do not double-discriminate detached HEAD

2013-07-07 Thread Junio C Hamano 
John Szakmeister j...@szakmeister.net writes:

 On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra artag...@gmail.com 
 wrote:
 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 artag...@gmail.com
 ---
  For cuteness :)

 Personally, I'd rather see the parens kept.  Not everyone sees red
 very well--I know several people who can't see it at all, and it keeps
 it consistent with non-colored output.

+1; I find red on many terminal emulators to be too dark to tell,
especially in a small font, from black myself.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] prompt: do not double-discriminate detached HEAD

2013-07-07 Thread Kyle McKay 

On Jul 7, 2013, at 10:53, Junio C Hamano wrote:

John Szakmeister j...@szakmeister.net writes:

On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra artag...@gmail.com 
 wrote:

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 artag...@gmail.com
---
For cuteness :)


Personally, I'd rather see the parens kept.  Not everyone sees red
very well--I know several people who can't see it at all, and it  
keeps

it consistent with non-colored output.


+1; I find red on many terminal emulators to be too dark to tell,
especially in a small font, from black myself.


+1; me too for the same reason.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html