From 05c5924434786c6720e0a497215fce0337d57d82 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 20 Feb 2017 14:14:49 +0100 Subject: [PATCH] luci.mk: fix branch detection in detached HEAD state When LuCI is checked out via pinned feeds configuration, its source tree will end up in detached head state, requiring some more magic to figure out the proper branch. Signed-off-by: Jo-Philipp Wich --- luci.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/luci.mk b/luci.mk index 69aecaa25..26f3c94f9 100644 --- a/luci.mk +++ b/luci.mk @@ -70,7 +70,9 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ variant="LuCI"; \ if git log -1 >/dev/null 2>/dev/null; then \ - branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null)"; \ + branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null || \ + git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \ + sed -e 's|^.*/||; s| .*||; q')"; \ if [ "$$branch" != "master" ]; then \ variant="LuCI $$branch branch"; \ else \ -- 2.25.1