RepoMirrors/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k synced 2025-01-10 07:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nmaggioni-next' into vcs-tag-display

Browse Source
This commit is contained in:
Ben Hilburn 2016-04-12 08:53:51 -04:00
commit f060a90c58
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
functions/vcs.zsh
View File

@ -61,10 +61,23 @@ function +vi-git-remotebranch() {
}
function +vi-git-tagname() {
local tag
# Only show the tag name if we are not in DETACHED_HEAD state,
# or if the current branch's HEAD is the same commit as a tag but
# doesn't have the same name
local tag
tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
[[ -n "${tag}" ]] && hook_com[branch]="$(print_icon 'VCS_TAG_ICON')${tag}"
if [[ -z "$(git symbolic-ref HEAD 2>/dev/null)" || ! -z "${tag}" ]] ; then
head=$(git describe --all)
# Make sure that detached head or checked out name differs from tag name
if [[ "${head}" != "${tag}" ||
"$(git rev-parse --abbrev-ref HEAD)" != "${tag}" &&
"$(git rev-parse --abbrev-ref HEAD)" != "HEAD" &&
"$(git rev-list -n 1 HEAD)" == "$(git rev-list -n 1 ${tag})" ]]; then
# Append the tag segment to the branch one
[[ -n "${tag}" ]] && hook_com[branch]+=" $(print_icon 'VCS_TAG_ICON')${tag}"
fi
fi
}
# Show count of stashed changes