From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 10 Sep 2022 12:54:25 +0000 (+0200)
Subject: luci.mk: rework logic to determine current branch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c2f249aada983d4a3e3153f92829e6a562eae9e;p=project%2Fluci.git

luci.mk: rework logic to determine current branch

In case `git branch --remote` yields no result, fall back to `git branch`
without `--remote` since it is possible that the local branch has not
been pushed yet.

Also simplify extraction of the branch name by not passing `--verbose`
and utilizing variable substitutions instead of sed expressions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 447e362f0b56e5efdc2737899831297901736a0e)
---

diff --git a/luci.mk b/luci.mk
index e143cac415..dbb9c8eb32 100644
--- a/luci.mk
+++ b/luci.mk
@@ -114,10 +114,11 @@ PKG_SRC_VERSION?=$(if $(DUMP),x,$(strip $(call findrev,1)))
 PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \
 	variant="LuCI"; \
 	if git log -1 >/dev/null 2>/dev/null; then \
-		branch="$$(git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \
-			sed -rne 's|^[^/]+/([^ ]+) [a-f0-9]{40} .+$$|\1|p' | head -n1)"; \
+		branch=$$(git branch --remote --no-abbrev --contains 2>/dev/null | tail -n1); \
+		branch=$${branch:-$$(git branch --no-abbrev --contains 2>/dev/null)}; \
+		branch=$${branch#? }; branch=$${branch#*/}; \
 		if [ "$$branch" != "master" ]; then \
-			variant="LuCI $$branch branch"; \
+			variant="LuCI $${branch:-unknown} branch"; \
 		else \
 			variant="LuCI Master"; \
 		fi; \