bash-prompt: skip comparing with remote if upstream not defined for branch

diff --git a/bash-prompt.sh b/bash-prompt.sh
index 467e4b372fac0e9dcb21da1860da98a595f7b749..959fd028ac094cfed203045a09ef3d82638a3af1 100644 (file)
--- a/bash-prompt.sh
+++ b/bash-prompt.sh
@@ -55,18 +55,20 @@ __bash_parse_git_branch() {
        fi
 
        # http://stackoverflow.com/a/3278427
-       local=$(git rev-parse @)
-       remote=$(git rev-parse '@{u}')
-       base=$(git merge-base @ '@{u}')
-
-       if [ $local = $remote ]; then
-               remote=""
-       elif [ $local = $base ]; then
-               remote="${YELLOW}↓"
-       elif [ $remote = $base ]; then
-               remote="${YELLOW}↑"
-       else
-               remote="${YELLOW}↕"
+       remote=$(git rev-parse '@{u}' 2>/dev/null)
+       if [[ -n "$remote" ]]; then
+               local=$(git rev-parse @)
+               base=$(git merge-base @ '@{u}')
+
+               if [[ $local = $remote ]]; then
+                       remote=""
+               elif [[ $local = $base ]]; then
+                       remote="${YELLOW}↓"
+               elif [[ $remote = $base ]]; then
+                       remote="${YELLOW}↑"
+               else
+                       remote="${YELLOW}↕"
+               fi
        fi
 
        echo " (${branch})${remote}${state}"