Re: [PATCH] prompt: do not double-discriminate detached HEAD
Junio C Hamano wrote: > +1; I find red on many terminal emulators to be too dark to tell, > especially in a small font, from black myself. It's a matter of taste anyway. I hope everyone's not going colorblind from writing too much C89 and Bourne shell ;) Eduardo R. D'Avila wrote: > I think color in terminals should be used to highlight and make it easier to > see > textual information, not to replace them. So I would keep the parenthesis. I largely agree, but there are a few exceptions. Most notably, have you noticed how, in addition to font-locking, scheme-mode replaces lambda with λ? -- 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
I think color in terminals should be used to highlight and make it easier to see
textual information, not to replace them. So I would keep the parenthesis.
> + test -n "${GIT_PS1_SHOWCOLORHINTS-}" ||
> b="($b)"
Also, the proposed change has a side-effect because color is not possible in
non-pc mode, even if GIT_PS1_SHOWCOLORHINTS is defined. (Non-pc mode
with GIT_PS1_SHOWCOLORHINTS defined would make the detached HEAD not be
shown neither in red nor within parenthesis).
Regards,
Eduardo R. D'Avila
--
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
On Jul 7, 2013, at 10:53, Junio C Hamano wrote: John Szakmeister writes: On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra > 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 --- 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
Re: [PATCH] prompt: do not double-discriminate detached HEAD
John Szakmeister writes: > On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra > 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 >> --- >> 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
On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra 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 > --- > 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
[PATCH] prompt: do not double-discriminate detached HEAD
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
---
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
