From bcf65c78665a047864892474b1e69846d2b614cc Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Jan 22 2019 21:43:56 +0000
Subject: [macros] use basename instead of --short for symbolic-ref due to compatibility, use --revs-only for rev-parse


---

diff --git a/macros/macros.d/git.bash b/macros/macros.d/git.bash
index 50b8d63..29db436 100644
--- a/macros/macros.d/git.bash
+++ b/macros/macros.d/git.bash
@@ -31,8 +31,8 @@ declare -x GIT_ORIGIN_URL
 GIT_VERSION="${GIT_VERSION:-$(git --version)}"
 GIT_LEGACY="${GIT_LEGACY:-$(echo "$GIT_VERSION" | grep 'git version 1')}"
 GIT_ROOT="${GIT_ROOT:-$(git rev-parse --show-toplevel 2> /dev/null)}"
-GIT_BRANCH="${GIT_BRANCH:-$(git -C "$GIT_ROOT" symbolic-ref --short HEAD 2> /dev/null)}"
-GIT_HEAD="${GIT_HEAD:-${INPUT_GIT_REVISION:-$(git -C "$GIT_ROOT" rev-parse "$GIT_BRANCH" 2> /dev/null)}}"
+GIT_BRANCH="${GIT_BRANCH:-$(basename "$(git -C "$GIT_ROOT" symbolic-ref HEAD 2> /dev/null)")}"
+GIT_HEAD="${GIT_HEAD:-${INPUT_GIT_REVISION:-$(git -C "$GIT_ROOT" rev-parse --revs-only "$GIT_BRANCH" 2> /dev/null)}}"
 GIT_HEAD_SHORT="${GIT_HEAD_SHORT:-$(expr substr "$GIT_HEAD" 1 7)}"
 GIT_ORIGIN_URL="${GIT_ORIGIN_URL:-$(git -C "$GIT_ROOT" config --get remote.origin.url 2> /dev/null)}"