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

make git_prompt_info aware of detached HEAD

Browse source 
this commit also checks for tag names once the repository has been
determined to be in a detached HEAD state
This commit is contained in:
sonnym 2012-03-25 16:10:32 -04:00
commit ee9bb16196
1 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/git.zsh
View file

@ -1,26 +1,39 @@
# 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=''
local GIT_STATUS=''
local CLEAN_MESSAGE='nothing to commit (working directory clean)'
if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
SUBMODULE_SYNTAX="--ignore-submodules=dirty"
fi
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
GIT_STATUS=$(git status -s ${git_submodule_syntax} 2> /dev/null | tail -n1)
else
GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
GIT_STATUS=$(git status -s ${git_submodule_syntax} -uno 2> /dev/null | tail -n1)
fi
if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null) ]]; then
if [[ -n $(git status -s ${git_submodule_syntax} -uno 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
@ -50,6 +63,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