linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +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 8a31940ec0
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/git.zsh
View file

@ -1,23 +1,41 @@
# get the name of the branch we are on # get the name of the branch we are on
function git_prompt_info() { function git_prompt_info() {
ref=$(git symbolic-ref 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)
if [ $branch_name = "## HEAD (no branch)" ]; then
# set tag name if found
tag_name=$(git name-rev --name-only $(git --no-pager show --stat 2> /dev/null | head -n 1 | awk '{ print $2 }') 2> /dev/null)
if [ -z $tag_name ]; then
ref="detached HEAD"
else
ref=$tag_name
fi
else
return
fi
fi
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
} }
# Checks if working tree is dirty # Checks if working tree is dirty
parse_git_dirty() { parse_git_dirty() {
local SUBMODULE_SYNTAX='' if [[ -n $(git status -s $(git_submodule_syntax) 2> /dev/null) ]]; then
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
echo "$ZSH_THEME_GIT_PROMPT_DIRTY" echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN" echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
fi 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 # Checks if there are commits ahead from remote
function git_prompt_ahead() { function git_prompt_ahead() {