kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

prompt: introduce GIT_PS1_STATESEPARATOR 

A typical prompt looks like:

    artagnon|master *=:~/src/git$
                   ^
                   why do we have this space?

Nobody has branch names that end with +, *, =, < or > anyway, so it
doesn't serve the purpose of disambiguation.

Make this separator configurable via GIT_PS1_STATESEPARATOR.  This means
that you can set it to "" and get this prompt:

    artagnon|master*=:~/src/git$

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ramkumar Ramachandra 2013-05-17 14:25:46 +05:30 committed by Junio C Hamano
parent 629b60a77d
commit 15a54fb809
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/completion/git-prompt.sh
View File

@ -359,6 +359,7 @@ __git_ps1 ()
fi fi
fi fi


local z="${GIT_PS1_STATESEPARATOR-" "}"
local f="$w$i$s$u" local f="$w$i$s$u"
if [ $pcmode = yes ]; then if [ $pcmode = yes ]; then
local gitstring= local gitstring=
@ -384,7 +385,7 @@ __git_ps1 ()
gitstring="\[$branch_color\]$branchstring\[$c_clear\]" gitstring="\[$branch_color\]$branchstring\[$c_clear\]"


if [ -n "$w$i$s$u$r$p" ]; then if [ -n "$w$i$s$u$r$p" ]; then
gitstring="$gitstring " gitstring="$gitstring$z"
fi fi
if [ "$w" = "*" ]; then if [ "$w" = "*" ]; then
gitstring="$gitstring\[$bad_color\]$w" gitstring="$gitstring\[$bad_color\]$w"
@ -400,13 +401,13 @@ __git_ps1 ()
fi fi
gitstring="$gitstring\[$c_clear\]$r$p" gitstring="$gitstring\[$c_clear\]$r$p"
else else
gitstring="$c${b##refs/heads/}${f:+ $f}$r$p" gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
fi fi
gitstring=$(printf -- "$printf_format" "$gitstring") gitstring=$(printf -- "$printf_format" "$gitstring")
PS1="$ps1pc_start$gitstring$ps1pc_end" PS1="$ps1pc_start$gitstring$ps1pc_end"
else else
# NO color option unless in PROMPT_COMMAND mode # NO color option unless in PROMPT_COMMAND mode
printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p" printf -- "$printf_format" "$c${b##refs/heads/}${f:+$z$f}$r$p"
fi fi
fi fi
} }