]> git.phdru.name Git - dotfiles.git/commitdiff
Feat(bash-prompt): Reorder signs: `*+$%`
authorOleg Broytman <phd@phdru.name>
Fri, 28 Aug 2020 23:30:14 +0000 (02:30 +0300)
committerOleg Broytman <phd@phdru.name>
Fri, 28 Aug 2020 23:34:02 +0000 (02:34 +0300)
Order signs the same way `__git_ps1` does.

admin/prog/bash_prompt

index f37966892fa5eed9dc1e3b8d2b03482b0a4b8827..e04e6e86e83bc30556d3d6631b872e1b21280ada 100644 (file)
@@ -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