From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 20 Feb 2017 13:14:49 +0000 (+0100)
Subject: luci.mk: fix branch detection in detached HEAD state
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79992f1a670aad9306d96d61b8df83d2cd397ed1;p=oweals%2Fluci.git

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 <jo@mein.io>
---

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 \