commit d43f4296dd4c7012d18b20e2504ba772b3572035
author Carlos Sanchez <carlos@apache.org> Mon Feb 06 13:50:34 2017 +0100
committer Carlos Sanchez <carlos@apache.org> Mon Feb 06 13:50:53 2017 +0100
tree e6bc93a001791e19afebce075ee17c5b7d8a351c
parent 3ffc4e4a7f420818718872e31c58aff78e81e053

[INFRA-729] Correctly determine what branch are we in

publish.sh

diff --git a/publish.sh b/publish.sh
index 7ca49d3..d59d450 100755
--- a/publish.sh
+++ b/publish.sh
@@ -25,7 +25,12 @@
 }
 
 get-variant() {
-    local branch; branch=$(git rev-parse --abbrev-ref HEAD)
+    local branch
+    branch=$(git show-ref --heads | grep $(git rev-list -n 1 HEAD) | sed -e 's#.*/heads/##')
+    if [ -z "$branch" ]; then
+        >&2 echo "Could not get the current branch name for commit, not in a branch?: $(git rev-list -n 1 HEAD)"
+        return 1
+    fi
     case "$branch" in
         master) echo "" ;;
         *) echo "-${branch}" ;;