Prefixes the branch name with "BARE:" if you're in a bare repository.
Signed-off-by: Marius Storm-Olsen <git@storm-olsen.com> --- Well there you go. That's what you get for not testing your patch after a rebase.. another version. ;-)
Next had progressed into handling the --inside-git-dir case, and would replace branch name with "GIT_DIR!". Now, that's not so useful when that GIT_DIR! is a bare repository, so this version will prefix the branch name with "BARE:" instead.
contrib/completion/git-completion.bash | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
Show changes to contrib/completion/git-completion.bash +8 −3
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ec587d2..90ba428 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 @@ -137,9 +142,9 @@ __git_ps1 () if [ -n "$b" ]; then if [ -n "${1-}" ]; then - printf "$1" "${b##refs/heads/}$w$i$r" + printf "$1" "$c${b##refs/heads/}$w$i$r" else - printf " (%s)" "${b##refs/heads/}$w$i$r" + printf " (%s)" "$c${b##refs/heads/}$w$i$r" fi fi fi
-- 1.6.2.rc0.5.gf970