summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanPablo <jpabloaj@gmail.com>2011-06-26 22:10:49 -0400
committerLeonid Volnitsky <Leonid@Volnitsky.com>2011-07-01 09:20:25 +0300
commit72a4c8c7fe64c4b784dc5664e406f0f8cd0126cd (patch)
tree4d26488314cc0f2f4b88e6705a999f91c677bdca
parentfixed bad route to .git (diff)
downloadgit-prompt-72a4c8c7fe64c4b784dc5664e406f0f8cd0126cd.tar.gz
git-prompt-72a4c8c7fe64c4b784dc5664e406f0f8cd0126cd.tar.bz2
git-prompt-72a4c8c7fe64c4b784dc5664e406f0f8cd0126cd.zip
remote origin o
-rwxr-xr-xgit-prompt.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/git-prompt.sh b/git-prompt.sh
index 781c62e..2b2869b 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -526,11 +526,7 @@ parse_git_status() {
if [[ $(git branch -a | grep $remote) != "" ]]; then
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
+ remotes+=" "${remote/origin/o}:$nRemoteCommit
fi
else
git fetch $remote >& /dev/null &