From 90cf992c4516dd8b38d3cade61955f0a84d95f90 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 29 Aug 2020 15:44:48 +0300 Subject: [PATCH] Feat(bash-prompt): Switch back to `prompt_git` The problem with `__git_ps1` is it touches submodules; that bad for backup. --- admin/prog/bash_prompt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt index e3d491b..eb152c9 100644 --- a/admin/prog/bash_prompt +++ b/admin/prog/bash_prompt @@ -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\\\\\]" -- 2.39.5