X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fprog%2Fbash_prompt;h=e04e6e86e83bc30556d3d6631b872e1b21280ada;hb=a1df7fa8cc5301684ae8eb8bc2852a05531b7816;hp=f37966892fa5eed9dc1e3b8d2b03482b0a4b8827;hpb=85f7998067cab03a7ea1bb71e85e92887141442c;p=dotfiles.git diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt index f379668..e04e6e8 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