update to most recent __git_ps1_improved

Author: koffeinfrei

README.md

@@ -19,7 +19,7 @@ master ✕✓? ↑1↓5
 ...with the original git prompt
 
 ```bash
-master *+% u+1-5
+master *+%|u+1-5
 ```
 
 ## Usage

bash-git-prompt

@@ -6,17 +6,15 @@ GIT_PS1_SHOWUNTRACKEDFILES=true
 GIT_PS1_SHOWUPSTREAM="verbose"
 
 __git_ps1_improved() {
-    local git_current_branch_name="\$(__git_ps1 '%s' | sed 's/ .\+//' | sed -e 's/[\\\\/&]/\\\\\\\\&/g')"
     local git_status_substitutes=(
-        "s/$git_current_branch_name//;"            # remove branch temporarily
-        "s/u//;"                                   # upstream
-        "s/+\([0-9]\+\)/↑\1/;"                     # outgoing
-        "s/-\([0-9]\+\)/↓\1/;"                     # incoming
-        "s/%/?/;"                                  # untracked
-        "s/+/✓/;"                                  # staged
-        "s/*/✕/;"                                  # unstaged
-        "s/\(.*\)/⑂ $git_current_branch_name\1/;"  # insert branch again
+        "s/|u=/ =/;"                                # equal to upstream
+        "s/|u+\([0-9]\+\)-\([0-9]\+\)/ ↑\1↓\2/;"    # diverged from upstream
+        "s/|u+\([0-9]\+\)/ ↑\1/;"                   # ahead of upstream
+        "s/|u-\([0-9]\+\)/ ↓\1/;"                   # behind upstream
+        "s/%/?/;"                                   # untracked
+        "s/+/✓/;"                                   # staged
+        "s/*/✕/;"                                   # unstaged
     )
 
-    echo "\$(__git_ps1 '%s'| sed \"${git_status_substitutes[@]}\")"
+    echo "⑂ \$(__git_ps1 '%s'| sed \"${git_status_substitutes[@]}\")"
 }