2011-06-01 20:14:20 +02:00
|
|
|
# Renders the name of the current branch.
|
|
|
|
function git_prompt_info() {
|
|
|
|
local branch=$(git_current_branch)
|
|
|
|
if [[ -n "$branch" ]]; then
|
|
|
|
echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Gets the current branch.
|
|
|
|
function git_current_branch() {
|
|
|
|
local ref=$(git symbolic-ref HEAD 2> /dev/null)
|
|
|
|
if [[ -n "$ref" ]]; then
|
|
|
|
echo "${ref#refs/heads/}"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Checks if the working tree is dirty.
|
|
|
|
function parse_git_dirty() {
|
|
|
|
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
|
|
|
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
|
|
|
else
|
|
|
|
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Checks if there are commits ahead from remote.
|
|
|
|
function git_prompt_ahead() {
|
|
|
|
if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
|
|
|
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Formats the prompt string for current git commit short SHA.
|
|
|
|
function git_prompt_short_sha() {
|
|
|
|
local sha=$(git rev-parse --short HEAD 2> /dev/null)
|
|
|
|
if [[ -n "$sha" ]]; then
|
|
|
|
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Formats the prompt string for current git commit long SHA.
|
|
|
|
function git_prompt_long_sha() {
|
|
|
|
local sha=$(git rev-parse HEAD 2> /dev/null)
|
|
|
|
if [[ -n "$sha" ]]; then
|
|
|
|
echo "${ZSH_THEME_GIT_PROMPT_SHA_BEFORE}${sha}${ZSH_THEME_GIT_PROMPT_SHA_AFTER}"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Gets the status of the working tree.
|
|
|
|
function git_prompt_status() {
|
|
|
|
local indicators line untracked added modified renamed deleted
|
|
|
|
while IFS=$'\n' read line; do
|
|
|
|
if [[ "$line" =~ '^\?\? ' ]]; then
|
|
|
|
[[ -n $untracked ]] && continue || untracked='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_UNTRACKED}${indicators}"
|
|
|
|
fi
|
|
|
|
if [[ "$line" =~ '^(((A|M|D|T) )|(AD|AM|AT|MM)) ' ]]; then
|
|
|
|
[[ -n $added ]] && continue || added='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_ADDED}${indicators}"
|
|
|
|
fi
|
|
|
|
if [[ "$line" =~ '^(( (M|T))|(AM|AT|MM)) ' ]]; then
|
|
|
|
[[ -n $modified ]] && continue || modified='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_MODIFIED}${indicators}"
|
|
|
|
fi
|
|
|
|
if [[ "$line" =~ '^R ' ]]; then
|
|
|
|
[[ -n $renamed ]] && continue || renamed='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_RENAMED}${indicators}"
|
|
|
|
fi
|
|
|
|
if [[ "$line" =~ '^( D|AD) ' ]]; then
|
|
|
|
[[ -n $deleted ]] && continue || deleted='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_DELETED}${indicators}"
|
|
|
|
fi
|
|
|
|
if [[ "$line" =~ '^UU ' ]]; then
|
|
|
|
[[ -n $unmerged ]] && continue || unmerged='yes'
|
|
|
|
indicators="${ZSH_THEME_GIT_PROMPT_UNMERGED}${indicators}"
|
|
|
|
fi
|
|
|
|
done < <(git status --porcelain 2> /dev/null)
|
|
|
|
echo $indicators
|
|
|
|
}
|
|
|
|
|
2010-06-03 21:03:26 +02:00
|
|
|
alias g='git'
|
2011-04-03 13:50:05 +02:00
|
|
|
compdef g=git
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gst='git status'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gst=git-status
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gl='git pull'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gl=git-pull
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gup='git fetch && git rebase'
|
2011-04-03 21:28:19 +02:00
|
|
|
compdef _git gup=git-fetch
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gp='git push'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gp=git-push
|
2011-04-12 10:19:15 +02:00
|
|
|
gdv() { git-diff -w "$@" | view - }
|
2011-04-03 21:28:19 +02:00
|
|
|
compdef _git gdv=git-diff
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gc='git commit -v'
|
2011-04-03 21:28:19 +02:00
|
|
|
compdef _git gc=git-commit
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gca='git commit -v -a'
|
2011-04-03 21:28:19 +02:00
|
|
|
compdef _git gca=git-commit
|
2010-12-20 16:13:47 +01:00
|
|
|
alias gco='git checkout'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gco=git-checkout
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gb='git branch'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gb=git-branch
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gba='git branch -a'
|
2011-04-03 21:28:19 +02:00
|
|
|
compdef _git gba=git-branch
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gcount='git shortlog -sn'
|
2011-04-03 13:50:05 +02:00
|
|
|
compdef gcount=git
|
2010-06-03 21:03:26 +02:00
|
|
|
alias gcp='git cherry-pick'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git gcp=git-cherry-pick
|
2010-10-09 16:03:08 +02:00
|
|
|
alias glg='git log --stat --max-count=5'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef _git glg=git-log
|
2010-06-03 21:03:26 +02:00
|
|
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
2011-04-03 15:43:39 +02:00
|
|
|
compdef git-svn-dcommit-push=git
|
2011-06-01 08:48:26 +02:00
|
|
|
alias ggpull='git pull origin $(git_current_branch)'
|
2011-04-03 13:50:05 +02:00
|
|
|
compdef ggpull=git
|
2011-06-01 08:48:26 +02:00
|
|
|
alias ggpush='git push origin $(git_current_branch)'
|
2011-04-03 13:50:05 +02:00
|
|
|
compdef ggpush=git
|
2011-06-01 08:48:26 +02:00
|
|
|
alias ggpnp='git pull origin $(git_current_branch) && git push origin $(git_current_branch)'
|
2011-04-03 13:50:05 +02:00
|
|
|
compdef ggpnp=git
|
2011-06-01 08:48:26 +02:00
|
|
|
|