summaryrefslogtreecommitdiff
path: root/lib/git.zsh
diff options
context:
space:
mode:
authorr3dDoX <patrick@walther-online.ch>2014-05-24 12:15:26 +0200
committerr3dDoX <patrick@walther-online.ch>2014-05-25 14:13:07 +0200
commit3c485db8c73bfebf379f3e9382eb8f300b608bd8 (patch)
tree432103db08a849bcd08612801dff0d02ad89e41c /lib/git.zsh
parent3913106b2e7127d396f27b652df812340ec0c871 (diff)
downloadzsh-3c485db8c73bfebf379f3e9382eb8f300b608bd8.tar.gz
zsh-3c485db8c73bfebf379f3e9382eb8f300b608bd8.tar.bz2
zsh-3c485db8c73bfebf379f3e9382eb8f300b608bd8.zip
replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0
Diffstat (limited to 'lib/git.zsh')
-rw-r--r--lib/git.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index 305a77aff..3eca8a6c6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -54,7 +54,7 @@ git_remote_status() {
# Checks if there are commits ahead from remote
function git_prompt_ahead() {
- if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+ if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
fi
}