]> git.phdru.name Git - dotfiles.git/blobdiff - admin/prog/bash_prompt
Fix(xtitle): Set xterm title/icon under screen/tmux
[dotfiles.git] / admin / prog / bash_prompt
index eb152c933d7c369d68685166c8c5d26f5cf3da7d..b89d340e23b72eef93aadd2fe33bf6ea2fe38304 100644 (file)
@@ -69,6 +69,20 @@ prompt_git() {
                       git rev-parse --short HEAD 2> /dev/null || \
                       printf "(unknown)")"
 
+        up=`git rev-parse --abbrev-ref @{u} 2>/dev/null`
+        if [ -n "$up" -a "$up" != "@{u}" ]; then
+            local left right
+            set -- `git rev-list --count --left-right @{u}...HEAD`
+            left=$1
+            right=$2
+            if [ "$left" -gt 0 ]; then
+                s="$s-$left"
+            fi
+            if [ "$right" -gt 0 ]; then
+                s="$s+$right"
+            fi
+        fi
+
         [ -n "$s" ] && s=" $s"
         printf " (%s)" "$branchName$s"
     fi