linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Succumbed to Peer Pressure

Browse source 
Change git_current_branch to current_branch.
This commit is contained in:
Andrew Hodges 2011-05-29 16:12:14 -04:00
commit 6c9fa1a13c
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/git.zsh
View file

@ -15,13 +15,13 @@ function parse_git_dirty() {
# Checks if there are commits ahead from remote # Checks if there are commits ahead from remote
function git_prompt_ahead() { function git_prompt_ahead() {
if $(echo "$(git log $(git_current_remote)/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then if $(echo "$(git log $(git_current_remote)/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
echo "$ZSH_THEME_GIT_PROMPT_AHEAD" echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
fi fi
} }
function git_prompt_behind() { function git_prompt_behind() {
if $(echo "$(git log HEAD..$(git_current_remote)/$(git_current_branch) 2> /dev/null)" | grep '^commit' &> /dev/null); then if $(echo "$(git log HEAD..$(git_current_remote)/$(current_branch) 2> /dev/null)" | grep '^commit' &> /dev/null); then
echo "$ZSH_THEME_GIT_PROMPT_BEHIND" echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
fi fi
} }
@ -67,13 +67,8 @@ function git_prompt_status() {
echo $STATUS echo $STATUS
} }
function git_current_branch() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo ${ref#refs/heads/}
}
function git_current_remote() { function git_current_remote() {
remote=$(git config --get "branch.$(git_current_branch).remote") remote=$(git config --get "branch.$(current_branch).remote")
if [ -z "$remote" ]; then if [ -z "$remote" ]; then
echo 'origin' echo 'origin'
else else