undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup: Add bare repository indicator for __git_ps1

Browse Source 
Signed-off-by: Marius Storm-Olsen <git@storm-olsen.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Marius Storm-Olsen 2009-02-21 15:48:43 +01:00 committed by Junio C Hamano
parent f50edca56c
commit ddb6d01023
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/completion/git-completion.bash
View File

@ -117,9 +117,14 @@ __git_ps1 ()
local w
local i
local c
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
b="GIT_DIR!"
if [ "true" = "$(git config --bool core.bare 2>/dev/null)" ]; then
c="BARE:"
else
b="GIT_DIR!"
fi
elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
@ -135,12 +140,6 @@ __git_ps1 ()
fi
fi
local c
if [ "true" = "$(git config --bool core.bare 2>/dev/null)" ]; then
c="BARE:"
fi
if [ -n "$b" ]; then
if [ -n "${1-}" ]; then
printf "$1" "$c${b##refs/heads/}$w$i$r"