From 7942a23c814ed482982d94cceed641a8b68eb5f4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 20 Feb 2017 14:34:16 +0100 Subject: [PATCH] luci.mk: only use remote branch detection LEDE's scripts/feeds script creates local branches named after the checked out commit hash, confusing local branch detection. Solely use remote branch detection to avoid misidentifying such cases. Signed-off-by: Jo-Philipp Wich --- luci.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/luci.mk b/luci.mk index 26f3c94f9..137886f1b 100644 --- a/luci.mk +++ b/luci.mk @@ -70,9 +70,8 @@ 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 || \ - git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \ - sed -e 's|^.*/||; s| .*||; q')"; \ + branch="$$(git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \ + sed -rne 's|^[^/]+/([^ ]+) [a-f0-9]{40} .+$$|\1|p' | head -n1)"; \ if [ "$$branch" != "master" ]; then \ variant="LuCI $$branch branch"; \ else \ -- 2.25.1