Merge branch 'master' into openbsd

1 files changed, 19 insertions, 3 deletions

diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash
index dca34928..1e8c568d 100644
--- a/bash/bashrc.d/prompt.bash
+++ b/bash/bashrc.d/prompt.bash
@@ -127,14 +127,30 @@ prompt() {
 
             # Collect symbols representing repository state
             local state
+
+            # Upstream HEAD has commits after local HEAD; we're "behind"
+            (($(git rev-list --count 'HEAD..@{u}' 2>/dev/null) > 0)) &&
+                state=${state}\<
+
+            # Local HEAD has commits after upstream HEAD; we're "ahead"
+            (($(git rev-list --count '@{u}..HEAD' 2>/dev/null) > 0)) &&
+                state=${state}\>
+
+            # Tracked files are modified
             git diff-files --quiet ||
-                state=${state}!
+                state=${state}\!
+
+            # Changes are staged
             git diff-index --cached --quiet HEAD ||
-                state=${state}+
+                state=${state}\+
+
+            # There are some untracked and unignored files
             [[ -n $(git ls-files --others --exclude-standard) ]] &&
                 state=${state}\?
+
+            # There are stashed changes
             git rev-parse --quiet --verify refs/stash >/dev/null &&
-                state=${state}^
+                state=${state}\^
 
             # Print the status in brackets; add a git: prefix only if there
             # might be another VCS prompt (because PROMPT_VCS is set)