Fix(xtitle): Set xterm title/icon under screen/tmux

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 4e428f398450283bf5d72833cab7e453e776e420..b89d340e23b72eef93aadd2fe33bf6ea2fe38304 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -70,18 +70,16 @@ prompt_git() {
                       printf "(unknown)")"
 
         up=`git rev-parse --abbrev-ref @{u} 2>/dev/null`
-        if [ -n "$up" ]; then
+        if [ -n "$up" -a "$up" != "@{u}" ]; then
             local left right
-            set -- `git rev-list --count --left-right @{u}...@`
+            set -- `git rev-list --count --left-right @{u}...HEAD`
             left=$1
             right=$2
-            if [ "$left" -gt 0 -o "$right" -gt 0 ]; then
-                if [ "$left" -gt 0 ]; then
-                    s="$s-$left"
-                fi
-                if [ "$right" -gt 0 ]; then
-                    s="$s+$right"
-                fi
+            if [ "$left" -gt 0 ]; then
+                s="$s-$left"
+            fi
+            if [ "$right" -gt 0 ]; then
+                s="$s+$right"
             fi
         fi