Merge branch 'next' of https://github.com/Xetius/powerlevel9k into xetius-vcs-hide-tags

README.md

@@ -348,8 +348,10 @@ customization is provided via:
 |`POWERLEVEL9K_SHOW_CHANGESET`|`false`|Set to `true` to display the hash / changeset in the segment.|
 |`POWERLEVEL9K_CHANGESET_HASH_LENGTH`|`12`|How many characters of the hash / changeset to display in the segment.|
 |`POWERLEVEL9K_VCS_SHOW_SUBMODULE_DIRTY`|`true`|Set to `false` to not reflect submodule status in the top-level repository prompt.|
+|`POWERLEVEL9K_VCS_HIDE_TAGS`|unset|Set to `true` to stop tags being displayed in the segment.|
 
-**vcs Symbols**
+
+##### vcs symbols
 
 The `vcs` segment uses various symbols to tell you the state of your repository.
 These symbols depend on your installed font and selected `POWERLEVEL9K_MODE`

functions/vcs.zsh

@@ -61,24 +61,26 @@ function +vi-git-remotebranch() {
 }
 
 function +vi-git-tagname() {
-  # If we are on a tag, append the tagname to the current branch string.
+  if [[ -z "${POWERLEVE9K_VCS_HIDE_TAGS}" ]]; then
-  local tag
+    # If we are on a tag, append the tagname to the current branch string.
-  tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
+    local tag
-
+    tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
-  if [[ -n "${tag}" ]] ; then
+
-    # There is a tag that points to our current commit. Need to determine if we
+    if [[ -n "${tag}" ]] ; then
-    # are also on a branch, or are in a DETACHED_HEAD state.
+      # There is a tag that points to our current commit. Need to determine if we
-    if [[ -z $(git symbolic-ref HEAD 2>/dev/null) ]]; then
+      # are also on a branch, or are in a DETACHED_HEAD state.
-      # DETACHED_HEAD state. We want to append the tag name to the commit hash
+      if [[ -z $(git symbolic-ref HEAD 2>/dev/null) ]]; then
-      # and print it. Unfortunately, `vcs_info` blows away the hash when a tag
+        # DETACHED_HEAD state. We want to append the tag name to the commit hash
-      # exists, so we have to manually retrieve it and clobber the branch
+        # and print it. Unfortunately, `vcs_info` blows away the hash when a tag
-      # string.
+        # exists, so we have to manually retrieve it and clobber the branch
-      local revision
+        # string.
-      revision=$(git rev-list -n 1 --abbrev-commit --abbrev=${POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH} HEAD)
+        local revision
-      hook_com[branch]="$(print_icon 'VCS_BRANCH_ICON')${revision} $(print_icon 'VCS_TAG_ICON')${tag}"
+        revision=$(git rev-list -n 1 --abbrev-commit --abbrev=${POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH} HEAD)
-    else
+        hook_com[branch]="$(print_icon 'VCS_BRANCH_ICON')${revision} $(print_icon 'VCS_TAG_ICON')${tag}"
-      # We are on both a tag and a branch; print both by appending the tag name.
+      else
-      hook_com[branch]+=" $(print_icon 'VCS_TAG_ICON')${tag}"
+        # We are on both a tag and a branch; print both by appending the tag name.
+        hook_com[branch]+=" $(print_icon 'VCS_TAG_ICON')${tag}"
+      fi
     fi
   fi
 }