diff options
| -rwxr-xr-x | git-prompt.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index 7743927..d6306bf 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -524,8 +524,13 @@ parse_git_status() { fi fi if [[ $(git branch -a | grep $remote) != "" ]]; then - if [[ -f $git_dir/FETCH_HEAD && $(git log --oneline HEAD..$remote/master) != "" ]]; then - remotes+=" "$remote:$(git log --oneline HEAD..$remote/master | wc -l) + nRemoteCommit=$(git log --oneline HEAD..$remote/master | wc -l) + if [[ -f $git_dir/FETCH_HEAD && $nRemoteCommit != "0" ]]; then + if [[ $remote == "origin" ]]; then + remotes+=" o:"$nRemoteCommit + else + remotes+=" "$remote:$nRemoteCommit + fi fi else git fetch $remote >& /dev/null & |