X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=e3d491b6c20ca5eb0ed1bcea18a8d04126ee8092;hb=5251876e9b3158749e93584439916c7a68d635f2;hp=f37966892fa5eed9dc1e3b8d2b03482b0a4b8827;hpb=9179da7b2b377a8bd9992e00ad90a071febadb51;p=dotfiles.git diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt index f379668..e3d491b 100644 --- a/admin/prog/bash_prompt +++ b/admin/prog/bash_prompt @@ -40,19 +40,14 @@ prompt_git() { # ensure index is up to date #git update-index --really-refresh -q &>/dev/null - # check for uncommitted changes in the index - if ! $(git diff --quiet --ignore-submodules --cached); then - s="$s+"; - fi - # check for unstaged changes if [ -n "$(git ls-files --modified)" ]; then s="$s*"; fi - # check for untracked files - if [ -n "$(git ls-files --others --exclude-standard)" ]; then - s="$s%"; + # check for uncommitted changes in the index + if ! $(git diff --quiet --ignore-submodules --cached); then + s="$s+"; fi # check for stashed files @@ -60,6 +55,11 @@ prompt_git() { s="$s$"; fi + # check for untracked files + if [ -n "$(git ls-files --others --exclude-standard)" ]; then + s="$s%"; + fi + fi # get the short symbolic ref @@ -69,7 +69,7 @@ prompt_git() { git rev-parse --short HEAD 2> /dev/null || \ printf "(unknown)")" - [ -n "$s" ] && s=" [$s]" + [ -n "$s" ] && s=" $s" printf " (%s)" "$branchName$s" fi }