X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=13d0c2dc599dd78313cfb470cc8eb199da693d72;hb=47fb918dcb6a516ac154ebff26c0c0b5c104c0e3;hp=7c6117ce49aee8e58262d395b2b85ac2e61c15f0;hpb=d6d0947f637535c4b2156aa8c32534f376e73526;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 7c6117c..13d0c2d 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -25,7 +25,7 @@ short_curdir() {
 
 # bash_prompt; adapted from
 # https://github.com/necolas/dotfiles/blob/master/shell/bash_prompt and
-# http://vitus-wagner.livejournal.com/1176589.html?thread=40146189#t40146189
+# https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
 
 prompt_git() {
     local s=""
@@ -47,12 +47,12 @@ prompt_git() {
 
             # check for unstaged changes
             if [ -n "$(git ls-files --modified)" ]; then
-                s="$s!";
+                s="$s*";
             fi
 
             # check for untracked files
             if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-                s="$s?";
+                s="$s%";
             fi
 
             # check for stashed files
@@ -96,7 +96,9 @@ set_prompts() {
 
    OPS1+="${debian_chroot:+($debian_chroot)}"
    OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
-   OPS1+="\$(prompt_git)"
+   if test -x /usr/bin/git >/dev/null 2>&1; then
+      OPS1+="\$(prompt_git)"
+   fi
    OPS1+="\\$\$SHLVL "
    export OPS1
 }