linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-09 02:24:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 51a1887a88 into 397c085a19

Browse source
This commit is contained in:
sonnym 2012-12-16 02:17:51 -08:00
commit d96595c54a
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/git.zsh
View file

@ -1,18 +1,31 @@
# get the name of the branch we are on
function git_prompt_info() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || \
ref=$(git rev-parse --short HEAD 2> /dev/null) || return
ref=$(git symbolic-ref HEAD 2> /dev/null)
if [ -z $ref ]; then
# check if in detached HEAD mode
branch_name=$(git status -sb $(git_submodule_syntax) 2> /dev/null | head -n 1)
if [ "$branch_name" = "## HEAD (no branch)" ]; then
tag_name=$(git name-rev --name-only $(git --no-pager show --stat 2> /dev/null | head -n 1 | awk '{ print $2 }') 2> /dev/null)
# set ref to tag name if found, else set to short sha
if [ -n $tag_name ]; then
ref=$tag_name
else
ref=$(git rev-parse --short HEAD 2> /dev/null)
fi
else
return
fi
fi
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
}
# Checks if working tree is dirty
parse_git_dirty() {
local SUBMODULE_SYNTAX=''
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
SUBMODULE_SYNTAX="--ignore-submodules=dirty"
fi
if [[ -n $(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then
if [[ -n $(git status -s $(git_submodule_syntax) 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
@ -39,6 +52,14 @@ git_remote_status() {
fi
}
git_submodule_syntax() {
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
echo "--ignore-submodules=dirty"
else
echo ""
fi
}
# Checks if there are commits ahead from remote
function git_prompt_ahead() {
if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then