From 994b9506162c98309049034ad6a71187a3cccdf8 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 14 May 2018 00:00:48 +0200
Subject: [PATCH] properly set GIT_BRANCH when building on gitlab-ci

https://docs.gitlab.com/ce/ci/variables/README.html
CI_COMMIT_REF_NAME

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
---
 src/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 9ba4bd42..022200f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,11 @@
 
 # Detect GIT revision
   GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..)
-  GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
+  ifneq (,$(CI_COMMIT_REF_NAME))
+    GIT_BRANCH = $(CI_COMMIT_REF_NAME)
+  else
+    GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
+  endif
   ifneq (master,$(GIT_BRANCH))
     GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)"
   endif