]> git.phdru.name Git - dotfiles.git/commitdiff
Feat(bash-prompt): Switch back to `prompt_git`
authorOleg Broytman <phd@phdru.name>
Sat, 29 Aug 2020 12:44:48 +0000 (15:44 +0300)
committerOleg Broytman <phd@phdru.name>
Sat, 29 Aug 2020 12:50:18 +0000 (15:50 +0300)
The problem with `__git_ps1` is it touches submodules;
that bad for backup.

admin/prog/bash_prompt

index e3d491b6c20ca5eb0ed1bcea18a8d04126ee8092..eb152c933d7c369d68685166c8c5d26f5cf3da7d 100644 (file)
@@ -74,18 +74,18 @@ prompt_git() {
     fi
 }
 
-if test -x /usr/bin/git >/dev/null 2>&1; then
-   if [ "`type -t __git_ps1`" != function ]; then
-      git_sh_prompt=`git --exec-path`/git-sh-prompt
-      test -r $git_sh_prompt && . $git_sh_prompt || :
-   fi
-   if [ "`type -t __git_ps1`" = function ]; then
-      GIT_PS1_SHOWDIRTYSTATE=true
-      GIT_PS1_SHOWSTASHSTATE=true
-      GIT_PS1_SHOWUNTRACKEDFILES=true
-      GIT_PS1_SHOWUPSTREAM=verbose
-   fi
-fi
+#if test -x /usr/bin/git >/dev/null 2>&1; then
+#   if [ "`type -t __git_ps1`" != function ]; then
+#      git_sh_prompt=`git --exec-path`/git-sh-prompt
+#      test -r $git_sh_prompt && . $git_sh_prompt || :
+#   fi
+#   if [ "`type -t __git_ps1`" = function ]; then
+#      GIT_PS1_SHOWDIRTYSTATE=true
+#      GIT_PS1_SHOWSTASHSTATE=true
+#      GIT_PS1_SHOWUNTRACKEDFILES=true
+#      GIT_PS1_SHOWUPSTREAM=verbose
+#   fi
+#fi
 
 set_prompts() {
       OPS1=''
@@ -110,11 +110,11 @@ set_prompts() {
    OPS1+="${debian_chroot:+($debian_chroot)}"
    OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
    if test -x /usr/bin/git >/dev/null 2>&1; then
-      if [ "`type -t __git_ps1`" = function ]; then
-         OPS1+="\$(__git_ps1)"
-      else
+      #if [ "`type -t __git_ps1`" = function ]; then
+      #   OPS1+="\$(__git_ps1)"
+      #else
          OPS1+="\$(prompt_git)"
-      fi
+      #fi
    fi
    # This is for .screenrc: shelltitle "\$ |$SHELL"
    #OPS1+="\[\033k\033\\\\\]"