git-tagname: reducing conditionals in logic

This commit is contained in:
Ben Hilburn 2016-04-12 09:30:28 -04:00
parent f060a90c58
commit 6fde7bf3fd

View file

@ -67,7 +67,10 @@ function +vi-git-tagname() {
local tag local tag
tag=$(git describe --tags --exact-match HEAD 2>/dev/null) tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
if [[ -z "$(git symbolic-ref HEAD 2>/dev/null)" || ! -z "${tag}" ]] ; then # if [[ -z "$(git symbolic-ref HEAD 2>/dev/null)" || ! -z "${tag}" ]] ; then
if [[ -n "${tag}" ]] ; then
# There is a tag that points to our current commit. Need to determine if we
# are also on a branch, or are in a DETACHED_HEAD state.
head=$(git describe --all) head=$(git describe --all)
# Make sure that detached head or checked out name differs from tag name # Make sure that detached head or checked out name differs from tag name
if [[ "${head}" != "${tag}" || if [[ "${head}" != "${tag}" ||