summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-05-17 08:55:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-17 17:01:17 (GMT)
commit15a54fb8095502217fce7c7c6dd14e9066b62ebe (patch)
tree94a246223cb321b3ff7b33ece9300f71c962b5de /contrib/completion
parent629b60a77d0bca1358af666605548acc4dcc5841 (diff)
downloadgit-15a54fb8095502217fce7c7c6dd14e9066b62ebe.zip
git-15a54fb8095502217fce7c7c6dd14e9066b62ebe.tar.gz
git-15a54fb8095502217fce7c7c6dd14e9066b62ebe.tar.bz2
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>
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-prompt.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index eaf5c36..fb9296b 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -359,6 +359,7 @@ __git_ps1 ()
fi
fi
+ local z="${GIT_PS1_STATESEPARATOR-" "}"
local f="$w$i$s$u"
if [ $pcmode = yes ]; then
local gitstring=
@@ -384,7 +385,7 @@ __git_ps1 ()
gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
if [ -n "$w$i$s$u$r$p" ]; then
- gitstring="$gitstring "
+ gitstring="$gitstring$z"
fi
if [ "$w" = "*" ]; then
gitstring="$gitstring\[$bad_color\]$w"
@@ -400,13 +401,13 @@ __git_ps1 ()
fi
gitstring="$gitstring\[$c_clear\]$r$p"
else
- gitstring="$c${b##refs/heads/}${f:+ $f}$r$p"
+ gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
fi
gitstring=$(printf -- "$printf_format" "$gitstring")
PS1="$ps1pc_start$gitstring$ps1pc_end"
else
# 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
}